Hi,
Supposed that we have following commit graph:
----A----B----C----D <- master
\
----E <- e
When we merge e branch by `git merge e`, obviously we will do 3-way
merge. Assumed that the merge doesn't conflict, Git will fire up
editor to edit `COMMIT_EDITMSG` for us to enter merge commit
message. Then we abort the commit by either delete all the lines
there, or comment all of them.
But when we check status by `git status`, Git says:
On branch master
All conflicts fixed but you are still merging.
(use "git commit" to conclude merge)
That message above is misleading, because we know that our merge
doesn't conflict (3-way merge applied successfully without conflict).
However, it makes sense only when we have resolved all conflicts
on the conflicted merge.
So for non-conflicted merge, we can say instead:
On branch <branch>
You are still merging, and the merge applied without any conflicts.
(use "git commit" to conclude merge)
Thanks.
--
An old man doll... just what I always wanted! - Clara
