Re: git is screwed

[Eli Zaretskii]

> From: Steinar Bang <address@hidden>
> Date: Thu, 26 Mar 2015 13:21:04 +0100
> 
> What I would do here is to open the ChangeLog in emacs and look for the
> conflict markers (search for "<<" (without the quotes)) and see if they
> make sense to me.  I then manually edit the result to what I want (I
> remove the conflict markers, then either pick one of the alternatives,
> both alternatives, or make a manual merge of the two, depending on what
> the conflict is).
> 
> Once I'm satisfied with the results, I stage the ChangeLog file for the
> merge commit:
>  git add lisp/ChangeLog
> 
> Right now I've told git that I've seen the conflict and have manually
> resolved it, and git will complete the merge when I give the following
> command:
>  git commit
> 
> (and as I said in a different post: I usually do this kind of merge
> conflict resolution from magit)

What's wrong with smerge-mode?  It should kick in automatically when
you have conflict markers, and also invoke "git add" automatically for
every file saved after resolving all of its conflicts.