（非常）长寿的分支上最安全的 git 合并选项
假设我们必须处理两个具有相同起源 A 的生命周期非常长的分支 B 和 C。
还假设分支 B 有时会合并到 C 中，并且许多冲突已以错误的方式解决。
在这种情况下，B 和 C 在很多方面都有分歧，并且在 C 中对 B 进行 git merge 或相反的操作效果不佳：许多分歧不会被视为冲突，因为它们可能已得到解决过去或出于其他一些 git 原因。
是否有任何 git merge 选项可以将每个差异标记为冲突？甚至之前解决的问题？
（最安全的做法是对 B 和 C 进行比较，手动比较每个文件并仅进行正确的更改。这可行，但缺点是您会丢失 git 历史记录。）
Suppose we have to deal with two very long lived branches B and C that share the same origin A.
Suppose also that branch B has sometimes been merged in C, and many conflicts have been resolved in the wrong way.
In this situation, both B and C diverge in many ways, and doing a git merge of B in C or the opposite does not work well: many divergences do not figure as conflicts because perhaps they have been resolved in the past or for some other git reasons.
Is there any git merge option that can signal every single difference as conflict? even the previous resolved ones?
(The safest thing to do is to do a diff of B and C, manually compare each file and take only the right changes. This works, but the downside is that you lose the git history.)
如果你对这篇内容有疑问，欢迎到本站社区发帖提问 参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。
绑定邮箱获取回复消息
由于您还没有绑定你的真实邮箱，如果其他用户或者作者回复了您的评论，将不能在第一时间通知您！
发布评论