stackoverflow 上有个帖子比较清楚的介绍了git merge的作用
If a file is only modified on one of the two branches involved in the merge, than it will not be mentioned. No merge, automatic or manual, is needed for this file.
If the file has been modified on both branches, then first an auto-merge will be attempted. This usually succeeds in the following two cases:
--The changes are to completely separate lines, with unchanged lines in between a line changed on one branch and a line changed on the other branch.
--The changes give exactly the same end result, for example the same commit appears on both branches.
If these aren't the case, then the automatic merge will fail, and Git will resort to asking for a manual merge.
网友评论