Re: git is screwed

[Stefan Monnier]

> 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

And if all went according to plan, Emacs-25 would have already done this
"git add" when you saved the file after removing the conflict markers.


        Stefan