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

Re: Git merge driver / attributes bug in 2.3.1?

From
Michael J Gruber <git@drmicha.warpmail.net>
Date
Mar 6, 2015, 14:12 UTC
Message-ID
<54F9B5C0.9050604@drmicha.warpmail.net>
In-Reply-To
<D8780C527EB1E642B3150E6D705B46D448E8058B@DWPWHMS531.dwpbank.local>
Gondek, Andreas venit, vidit, dixit 06.03.2015 14:31:
> The archive contains my test repository, the merge driver and the .gitconfig of the user. We don't have a global .gitconfig.
Thanks for the test repo!

Alas, the merge driver gets executed with v1.9.0-rc3, v1.8.5 and v1.7.0, at least over here - as it should be because of the conflict: two patches changing the same file. That conflict can be resolved automatically by the internal driver, of course. Maybe something else changed during the upgrade?

Michael
Previous: Gondek, AndreasNext: Junio C Hamano
Message 5 of 8 in “Git merge driver / attributes bug in 2.3.1?”
  1. Gondek, AndreasMar 5, 2015
  2. Junio C HamanoMar 5, 2015
  3. Michael J GruberMar 6, 2015
  4. AW: Git merge driver / attributes bug in 2.3.1?Gondek, Andreas, Mar 6, 2015
  5. Michael J GruberMar 6, 2015
  6. Junio C HamanoMar 6, 2015
  7. AW: Git merge driver / attributes bug in 2.3.1?Gondek, Andreas, Mar 9, 2015
  8. Michael J GruberMar 9, 2015

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.