Re: merge conflict tedium

[Michael Albinus]

Glenn Morris <address@hidden> writes:

> Hi,

Hi Glenn,

> Today's problems were caused by:
> 1) 08840f2
> 2) 536e6de and 13b586d, and b513feb

All of these commits are mine, and I'm very sorry for that. It happens
again and again that I forget the "don't merge" idiom in the commit
message, and even if I recognize it after the commit (it happens), I
don't know how to add it after a push. Is there something I could do?

> Conceptually the same commit (?), but made on different branches without
> any indication, coupled with a simultaneous reformat on master. Changing
> the same code on multiple branches at the same time is a PITA. Please
> merge it yourself if doing that.

It is not intended to be merged. After the crewation of Emacs 26.1.91,
I've seen on emba, that the code I've resolved in the morning in the
master branch, needed to be adapted also in the emacs-26 branch. A
cherry pick wasn't possible, so the looks-like-identical merge. Again, I
forgot to say "don't merge".

Do we have any other mean, to handle such situations? The current
workflow requires to add the proper wording during commit. I cannot
promise this will always work, so some more robust approach would be
welcome.

> End of complaint! :)

You have all rights to complain! I'm very sorry about.

Best regards, Michael.