In this example of how to squash git commits, the repository I’m using has three Git Flow compatible branches: master with one unmerged commit develop with five unmerged commits feature with three ...

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.

Also in VS Code 1.70, the three-way merge editor, for quickly resolving Git merge conflicts, is enabled by default. The merge editor features improved context menus, new commands to accept all ...