- xlwings Newsletter
- Posts
- xlwings Newsletter #7
xlwings Newsletter #7
How to merge Excel workbooks with Git
How to merge Excel workbooks with Git
Git is generally known to have a bit of a learning curve. For many, using and merging branches may already be on the list of advanced topics. But even if you are fluent with using branches and merging them, the fun usually stops when Git gives you this message: "Automatic merge failed; fix conflicts and then commit the result". If you use Git to track Excel files (which Git treats as binary files), you’ll almost always end up in such a conflict when merging two branches.
This post gives you a rundown on Git branches and when and why Excel files cause merge conflicts. We then see how to resolve such merge conflicts and introduce Git XL that allows to properly merge VBA code.
xlwings Meetups
London (Sep 23): Sign up for "Git for Excel"
NYC (Oct 3): Sign up for "Automated Testing of Excel workbooks with Python"
We're excited that Daniel Guetta, Senior Lecturer at
, will give a short talk about "Teaching machine learning via xlwings" at the meetup in NYC.
Refinitiv Developer Days
will talk about "Python, spreadsheets and financial data" at the following
Developer Days:
Product Updates
xlwings: v0.15.10, see release notes.
xltrail: v2.8.3, see release notes.