1×
Become a member
to unlock all features
Autoplay

    Fix Merge Conflicts While Changing Commits During an Interactive Rebase

    gitgit

    We'll enter a more complicated interactive rebase with:

    git rebase -i HEAD~2

    and intentionally cause a merge conflict in a previous commit.

    Then we can fix that merge conflict like normal, but finish up the rebase with:

    git rebase --continue