AW: Re*: AW: Getting the full path of a conflicting file within a custom merge driver?

homas Klanten, Dr. Christian Tonnesen Aufsichtsrat: Wilfried Groos (Vors.) -Ursprüngliche Nachricht- Von: Junio C Hamano [mailto:jch2...@gmail.com] Im Auftrag von Junio C Hamano Gesendet: Freitag, 5. Juni 2015 00:11 An: Gondek, Andreas Cc: git@vger.kernel.org Betreff: Re*: AW: Getting the full pa

AW: Getting the full path of a conflicting file within a custom merge driver?

liche Nachricht- Von: Junio C Hamano [mailto:jch2...@gmail.com] Im Auftrag von Junio C Hamano Gesendet: Montag, 1. Juni 2015 18:46 An: Gondek, Andreas Cc: git@vger.kernel.org Betreff: Re: Getting the full path of a conflicting file within a custom merge driver? "Gondek, Andreas" writes:

Getting the full path of a conflicting file within a custom merge driver?

Hello, I'm wondering if there is no option to find out the full path of a conflicting file from within a custom merge driver? If I understand this correctly, Git only provides the name of the 3 temporary local files and the size of the limiter. But is there any possibility to get the path of th

AW: Git merge driver / attributes bug in 2.3.1?

Aufsichtsrat: Wilfried Groos (Vors.) -Ursprüngliche Nachricht- Von: Junio C Hamano [mailto:gits...@pobox.com] Gesendet: Freitag, 6. März 2015 22:30 An: Michael J Gruber Cc: Gondek, Andreas; git@vger.kernel.org Betreff: Re: Git merge driver / attributes bug in 2.3.1? Michael J Gruber writes

Git merge driver / attributes bug in 2.3.1?

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=" in the .gitattributes is now executed even if there isn't any merge conflict. This only happens f