How to keep the original file name when solving merge conflicts?

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

How to keep the original file name when solving merge conflicts?

Chris
This post has NOT been accepted by the mailing list yet.
Hello,

I created my own merge driver. The driver exports files ending with *.pu to plain text by calling a special tool.
The tool expects the file with the original file name ending when exporting. There is no way for me to change how the tool operates.
Unfortunately git renames the file \Source\IMM\ieccontrol\AirValveGeneral\ABManualButton.pu into .merge_file_a12072 before starting the merge.
Is there any solution to keep the original file name and path when solving a merge conflict?

Thanks for you help,
Chris