git-xl-merge.exe not found

[john0810]

hi, I have recently installed the git xl trail through exe downloaded from the official website https://www.xltrail.com/git-xl
However when I try to merge 2 branches together (expected to have conflicts between the xlsm files in different branches), I get the following message:
git-xl-merge.exe 'xxx.xlsm' .merge_file_a11140 .merge_file_b11140 .merge_file_c11140: git-xl-merge.exe: command not found
Auto-merging xxx.xlsm
CONFLICT (content): Merge conflict in xxx.xlsm
Automatic merge failed; fix conflicts and then commit the result

I then open the vba editors in the xlsm file and found no conflicts. Moreover, there are no signs of any integration between the files. Please advise, thank you.

[Felix Zumstein]

Hi @johnfung95, the current version of Git XL doesn't support merging anymore, see: https://github.com/xlwings/git-xl/releases/tag/0.5.0

[john0810]

thanks~