[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: merge conflict tedium
|
From: |
Glenn Morris |
|
Subject: |
Re: merge conflict tedium |
|
Date: |
Thu, 10 Jan 2019 20:06:00 -0500 |
|
User-agent: |
Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) |
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.