Through the use of Git’s interactive rebase feature, I will squash both the develop and feature branches down to one commit. A post-squash merge will then bring both develop and feature branches into ...

When you have two branches in a project (e.g. a development branch and a master branch), both of which have changes that need to be combined, the git merge command is the natural and ...

Sublime Merge includes powerful features like an integrated git merge tool, the ability to search for specific commits, command line integration, code and file history, and syntax highlighting.

One benefit, of course, is that there were never any merge conflicts. Another is that they didn't have to learn how to use git commands.