本文介绍如何解决版本控制系统中不同分支合并时出现的代码冲突问题。主要包括识别冲突标记、选择保留更改内容、删除冲突标记并完成合并的过程。
Competing lines change merge conflict
merge is the point at which two lines of development reconverge(收敛).
the situation looks like two screenshots below:
figure-(1)
the other from gitk:
figure-(2)
To resolve this issue, must choose which changes to incorporate(合并) from different branches in a new commit. Rough/core procedures are what to list below:
(a)see&verify merge conflict in specific file
like <<<<<<,=====,>>>>> conflict markers
(b)decide changes you want in the final merge by deleting conflict markers.
(c)add or stage changes
(d)commit
removed file change merge conflict
(as follow-up without encountering yet)
扫一扫
1350
被折叠的 条评论
为什么被折叠?
到【灌水乐园】发言
