We have been maintaining a fork of JUCE with many changes and fixes that we require for our products.

But as JUCE advances in a fast pace, maintaining our branch while merging it with the latest improvements and changes from JUCE has proven to be somewhat of a challenge.

In this talk I'll describe the tools and techniques that we use to resolve all the merge conflicts while keeping our sanity, such as: git-mediate, sub-merge, and more.