Josh Stillman is a Software Engineer at Giant Machines
If you’ve ever had to deal with horrific merge conflicts from infrequently synced branches, I’ve felt your pain. Our team develops off of the Dev branch, promotes code to a QA branch for testing, and merges bug fixes into the QA branch before releasing to production. As we get closer to a release and do more work in QA, Dev can quickly get out of date. And it’s easy to forget to down-merge QA to Dev when you’re focused on getting a release out. But there’s a price to pay: when it comes time to down-merge after the release, resolving the merge conflicts can become a tedious, time-consuming, and error-prone nightmare.