Git Tips & Tricks

When using Gitflow, long-lived feature branches can create complications if other branches are based on them and the original feature branch is later merged to master via a squash merge. The following guides explains how to manage these situations, including using git rebase instead of git merge to avoid conflicts and how to effectively rebase branches after a squash merge.