search

xltrail / git-xl

Git extension: Makes git-diff work for VBA in Excel workbooks (xls* file types)
https://www.xltrail.com/git-xl
MIT License
561 stars 72 forks source link

git-xl-merge.exe not found #69

Closed johnfung95 closed 3 years ago

johnfung95 commented 3 years ago

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.

fzumstein commented 3 years ago

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

johnfung95 commented 3 years ago

thanks~