Hi, I would like to suggest some improvements here to make explanation clearer. I'm in Section 9, Handling Merge Conflicts: Recap page. First thing I want to say, "They appear on the same line but are different text." sentence. I think this sentence can be a bit more clearer. I couldn't understand it first. Maybe this will be better "Because these texts occupy the same line in the files on different branches. When we try to merge these files, git doesn't know which line do we want to see in our merged file and says 'there is a conflict'." or something like that. Sorry for my bad English.
Another thing, "git status will show that the files are no longer in conflict, but that you are in the middle of a merge. git add the file and then git commit it, and the merge will then automatically complete." To see the message "All conflicts fixed but you are still merging." user must have git added first.
1point618
commented
8 years ago