[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: merge conflict tedium

From: Michael Albinus
Subject: Re: merge conflict tedium
Date: Mon, 07 Jan 2019 22:10:59 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux)

Michael Albinus <address@hidden> writes:

Hi Glenn,

> 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.

Maybe it is possible, to ask in the *release-branch*, whether this
shall be merged to master. Interactively, when committing. This sole
question would be sufficient, at least for me.

Best regards, Michael.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]