Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets

[joakim]

Dmitry Gutov <address@hidden> writes:

> On 02/01/2015 06:17 PM, address@hidden wrote:
>> But wouldnt the xwidget branch still be in master then?
>
> Note the "check out the last master before the merge" step. That would
> be commit a2c32b0.

Ok, so I tried following your recipy, withouth really understanding why
it would help.

So I did:

git checkout -b master_xwfix a2c32b0
git rebase master_xwfix

... here I got into a series of conflict fixes. Since the commit scripts
are more scrupulous now, there are many whitespace conflicts and so on,
and when I got to a too long commit message conflict, I decided I'm
probbly doing something wrong.

Is there some other way to revert the merge?

I would like to revert, fix up the branch according to the various
advice I've gotten, and only then re-attempt a merge.




-- 
Joakim Verona