Make small commits on feature branches and cherry pick onto the master branch regularly. Rebase the feature branches on the master branch regularly. If your com

Make small commits on feature branches and cherry pick onto the master branch regularly. Rebase the feature branches on the master branch regularly. If your commits are small (1 to 50 lines outside of unit test code) at most you'll only have a few lines of merge conflicts. It's always possible to make smaller commits, and it's always possible to cherry pick onto master regularly. If you're not doing so, you're being lazy. This style has more benefits than easier merges. Smaller commits are easier to test and less prone to bugs. Also less likely to be affected by context switching.