Re: git commit/push and VC

[Eli Zaretskii]

> From: David Kastrup <address@hidden>
> Date: Sat, 22 Nov 2014 11:43:16 +0100
> 
> >   git merge master
> >   # resolve conflicts
> >   git commit -a -m "Merge from mainline."
> >
> > Is that correct?
> 
> I doubt that it works.  At any rate, Git does not distinguish between a
> file with merge conflict markers and one without merge conflict markers
> (which are valid file contents, after all).
> 
> It records unresolved conflicts in the index where they are overwritten
> when doing git-add.  I haven't checked whether git commit -a will
> actually overwrite a conflicted index.  If it does, we don't want to
> recommend that error-prone workflow which is likely to record files with
> unresolved conflicts as resolved.  If it doesn't, git commit -a will not
> help.  smerge-mode, incidentally, adds the file in question
> automatically anyway after all conflicts are resolved.  So if "# resolve
> conflicts" implies use of smerge-mode, just git commit should be enough.

Ah, okay, so we should mention smerge-mode there.  Thanks.