[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, 14 Jan 2019 17:39:23 +0100 |
|
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) |
Glenn Morris <address@hidden> writes:
> Michael Albinus wrote:
>
>> 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.
>
> Maybe that is a check you could implement locally for your use, but I
> really wouldn't worry about it.
I've ended up in a private function for `vc-before-checkin-hook'.
Best regards, Michael.