The archive contains my test repository, the merge driver and the .gitconfig of the user. We don't have a global .gitconfig. Mit freundlichen Grüßen Andreas Gondek Applications ________________________________ Deutsche WertpapierService Bank AG ITTAS Derendorfer Allee 2 40476 Düsseldorf Tel.: +49 69 5099 9503 Fax: +49 69 5099 85 9503 E-Mail: Andreas.Gondek@xxxxxxxxxx http://www.dwpbank.de Deutsche WertpapierService Bank AG | Wildunger Straße 14 | 60487 Frankfurt am Main Sitz der AG: Frankfurt am Main, HRB 56913 | USt.-ID: DE 813759005 Vorstand: Thomas Klanten, Dr. Christian Tonnesen Aufsichtsrat: Wilfried Groos (Vors.) -----Ursprüngliche Nachricht----- Von: Michael J Gruber [mailto:git@xxxxxxxxxxxxxxxxxxxx] Gesendet: Freitag, 6. März 2015 12:26 An: Gondek, Andreas; git@xxxxxxxxxxxxxxx Betreff: Re: Git merge driver / attributes bug in 2.3.1? Gondek, Andreas venit, vidit, dixit 05.03.2015 14:30: > Hello, > > after upgrading the Git installation on one of our development servers > from 1.9.0-rc3 to 2.3.1 we are experiencing strange behavior of merge > drivers. > > A merge driver registered as "* merge=<name_of_merge_driver>" in the > .gitattributes is now executed even if there isn't any merge conflict. > This only happens for files that are part of the merge. > > This is reproducible in test repositories. Can you share a minimal test repo? I've been trying to reproduce this, unsuccessfully so far. I guess it depends on how exactly those files are "part of the merge", and how the merge driver is set up. (I've tried with and without recursive.) Michael
<<attachment: testRepo.zip>>