in the user merge driver, I need to get the full path to the conflicting file.
Git provides only temporary files located in the root of the repository.
Can I ask Git which file it is trying to merge at the moment?
Any Git team that provides this information during a merge?
UPDATE: I sent to the Git mailing list. There is no choice at the moment, but my proposal for an additional parameter% P (path) can be implemented today.
UPDATE 2015-06-05: My request has been added to Git :) https://github.com/git/git/commit/ef45bb1f8156030446658d5bfb3983ce214a9e16
Hello Andreas
source share