kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Documentation/git-merge: explain --continue 

Currently, 'git merge --continue' is mentioned but not explained.

Explain it.

Signed-off-by: Michael J Gruber <git@grubix.eu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Michael J Gruber 2017-08-21 14:53:14 +02:00 committed by Junio C Hamano
parent 4d7268b888
commit e2de82f271
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/git-merge.txt
View File

@ -280,7 +280,10 @@ After seeing a conflict, you can do two things:

* Resolve the conflicts. Git will mark the conflicts in
the working tree. Edit the files into shape and
'git add' them to the index. Use 'git commit' to seal the deal.
'git add' them to the index. Use 'git commit' or
'git merge --continue' to seal the deal. The latter command
checks whether there is a (interrupted) merge in progress
before calling 'git commit'.

You can work through the conflict with a number of tools: