On 21 August 2017 at 14:53, Michael J Gruber <g...@grubix.eu> wrote: > Currently, 'git merge --continue' is mentioned but not explained. > > Explain it. > > Signed-off-by: Michael J Gruber <g...@grubix.eu> > --- > Documentation/git-merge.txt | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt > index 6b308ab6d0..615e6bacde 100644 > --- a/Documentation/git-merge.txt > +++ b/Documentation/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:
There are actually two things going on here. First, this mentions git merge --continue. Second, it explains what that command does. But the latter is done earlier (not exactly like here, but still). When git merge --continue originally appeared, this part of the docs was discussed briefly. Maybe interesting: https://public-inbox.org/git/xmqq60mn671x....@gitster.mtv.corp.google.com/ Martin
