我注意到当我遇到冲突时,通常只想进行选择。例如,在应用存储时,我遇到了以下情况:
sfGuardGroup:
g1:
label: Project Manager
name: manager
<<<<<<< Updated upstream
Permissions: [p_manager]
Children: [g2, g3, g4, g5]
=======
Permissions: [p_manager, p2, p3, p4, p5, p_request]
>>>>>>> Stashed changes
g2:
label: Junior PM (USA)
name: junior-manager-usa
Permissions: [p_junior, p_junior_usa, p_request]
...
我知道我想保留所有标记为“Updated upstream”的内容,并丢弃/忽略“Stashed changes”。是否可以告诉git仅使用“上游版本的该文件”?