diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-08-26 23:14:59 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-08-26 23:14:59 -0700 |
| commit | fb1fdf1f6a77bd1efab252589905f85f760611ab (patch) | |
| tree | 6e3a8bf5784f4709a0dbf3b12e1a8f1b5a43dd26 /git-merge.txt | |
| parent | 7526f0aeb1f0a4fa2a4a6fc213db28d5a1b8d418 (diff) | |
| download | git-htmldocs-fb1fdf1f6a77bd1efab252589905f85f760611ab.tar.gz | |
Autogenerated HTML docs for v2.14.1-459-g238e4
Diffstat (limited to 'git-merge.txt')
| -rw-r--r-- | git-merge.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/git-merge.txt b/git-merge.txt index 6b308ab6d..615e6bacd 100644 --- a/git-merge.txt +++ b/git-merge.txt @@ -288,7 +288,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: |