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>
Michael J Gruber committed
Aug 21, 2017 at 14:53 UTC
e2de82f27128441278da979ef101239c40188064
1 file changed
+4
-1
Documentation/git-merge.txt
+4
-1
@@ -280,7 +280,10 @@ After seeing a conflict, you can do two things:
280
281
* Resolve the conflicts. Git will mark the conflicts in
282
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'.
287
288
You can work through the conflict with a number of tools:
289