Re: Signal conflict on merging metadata-differing patches

From: Greg KH <gregkh@linuxfoundation.org>
Date: Nov 18, 2019, 17:35 UTC
Message-ID: <20191118173517.GA599094@kroah.com>
In-Reply-To: <20191118172917.GA6063@vmlxhi-102.adit-jv.com>

On Mon, Nov 18, 2019 at 06:29:17PM +0100, Eugeniu Rosca wrote:

Show 8 quoted lines

> Dear Git community,
> 
> Due to high inflow of patches which Linux maintainers carry on their
> shoulders and due to occasionally intricate relationships between
> consecutive revisions of the same series, it may [1] happen that two
> distinct revisions of the same patch (differing only/mostly in
> metadata, e.g. Author's time-stamp and commit description) may end up
> being merged on the same branch, without git to complain about that.

Why would git complain about that?

> Is there any "git merge" flag available off-the-shelf which (if used)
> would signal such situations?

I don't understand what you are looking for here. Two different versions of the patch were merged to different branches and then merged together, and git did the right thing with the resolution of the code.

What more can it do here?

thanks,

greg k-h