From: Junio C Hamano Date: Sun, 25 Aug 2013 03:22:02 GMT Subject: Re: [PATCH 07/13] Improve description in "How to merge" Message-ID: In-Reply-To: <8609038.1091034.1377329428557.JavaMail.ngmail@webmail08.arcor-online.net> Thomas Ackermann writes: > Describe the conflict resolution in terms of the > commands the user is supposed to use. > > Signed-off-by: Thomas Ackermann > --- > Documentation/user-manual.txt | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt > index ccbddc7..0656191 100644 > --- a/Documentation/user-manual.txt > +++ b/Documentation/user-manual.txt > @@ -1251,10 +1251,8 @@ Automatic merge failed; fix conflicts and then commit the result. > ------------------------------------------------- > > Conflict markers are left in the problematic files, and after > -you resolve the conflicts manually, you can update the index > -with the contents and run Git commit, as you normally would when > -creating a new file. > - > +you have resolved the conflicts manually, you can `git add` the > +new contents and do a `git commit` in the end. This is a slight documentation regression, as there are cases your conflict resolution is a removal of the file, isn't it? > If you examine the resulting commit using gitk, you will see that it > has two parents, one pointing to the top of the current branch, and > one to the top of the other branch.