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.