Re: git is screwed

[Steinar Bang <sb@dod.no>]

>>>>> Harald Hanche-Olsen <hanche@math.ntnu.no>:

>> MM lisp/ChangeLog

> That's your merge conflict.

> I have to go now, no time for the next couple hours. But perhaps
> someone else will give you advice.

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)