Resolving Git Rebase Merge Conflicts Last updated on February 2, 2021 by Sal Ferrarello When performing a Git rebase, I often find myself in the situation where I have one or more merge conflicts. This is how I resolve these merge conflicts.