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

Git union issue

From
BHBram Huenaerts <bramhuenaerts@me.com>
Date
Jul 30, 2020, 18:29 UTC
Message-ID
<A7C11212-1ECB-4D8D-B3B1-C7DB6673F3E6@me.com>
Goodafternoon, 
while trying to reduce conflicts on a changelog file, i tried eliminating conflicts using the .gitattributes with union defined for the CHANGELOG_UPCOMING.md file. I included the steps to come to this very strange issue. In the enclosed PDF, I tried to specify all the commands so it is easy to reproduce this strange issue which I hope is not a works as designed.
In case still something not clear. I’m happy to assist.
Kind regards,
Bram Huenaerts
Next: brian m. carlson
Message 1 of 3 in “Git union issue”
  1. Bram HuenaertsJul 30, 2020
  2. brian m. carlsonJul 31, 2020
  3. Junio C HamanoJul 31, 2020

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.