Course lesson
Fix Merge Conflicts While Changing Commits During an Interactive Rebase
We'll enter a more complicated interactive rebase with:
- Duration
- 3 min
- Access
- Free
- Transcript
- Retained from source evidence
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
# ennter interactive rebase
git rebase -i HEAD~2
# Then we can fix that merge conflict like normal, but finish up the rebase
git rebase --continue