Skip to content

Commit e2de82f

Browse files
mjggitster
authored andcommitted
Documentation/git-merge: explain --continue
Currently, 'git merge --continue' is mentioned but not explained. Explain it. Signed-off-by: Michael J Gruber <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 4d7268b commit e2de82f

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

Documentation/git-merge.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,10 @@ After seeing a conflict, you can do two things:
280280

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

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

0 commit comments

Comments
 (0)