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-xltrail suppresses git merge conflicts #40

Closed fzumstein closed 5 years ago

fzumstein commented 5 years ago

If you are merging two branches where an Excel workbook would cause a Git merge conflict, it does not raise the merge conflict anymore with git-xltrail installed. This is fine for VBA as git-xltrail handles this part but it is unexpected for the sheets.

fzumstein commented 5 years ago

closed in #41