git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Signal conflict on merging metadata-differing patches

From
EREugeniu Rosca <erosca@de.adit-jv.com>
Date
Nov 18, 2019, 17:29 UTC
Message-ID
<20191118172917.GA6063@vmlxhi-102.adit-jv.com>
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.

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

[1] https://patchwork.kernel.org/patch/11135107/#23007101
-- 
Best Regards,
Eugeniu
Next: Greg KH
Message 1 of 5 in “Signal conflict on merging metadata-differing patches”
  1. Eugeniu RoscaNov 18, 2019
  2. Greg KHNov 18, 2019
  3. Eugeniu RoscaNov 18, 2019
  4. Greg KHNov 18, 2019
  5. Junio C HamanoNov 19, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.