Git Rebase Cheat Sheet/Continue rebase after resolving conflicts

Resume the rebase once conflicts are fixed.

Section: Interactive Rebase Basics

Continue rebase after resolving conflicts

bash
bash
git rebase --continue
Explanation

Standard next step after resolving conflicts and staging the intended resolutions.

Learn the surrounding workflow

Compare similar commands or jump into common fixes when this command is part of a bigger troubleshooting path.

Related commands

Same sheet · prioritizing Interactive Rebase Basics
Interactive rebase last 3 commits
Edit the last 3 commits.
OpenIn sheetbashsame section
Edit rebase todo during a rebase
Open the rebase todo list while a rebase is in progress.
OpenIn sheetbashsame section
Show current patch during rebase
Inspect the patch currently being replayed.
OpenIn sheetbashsame section
Abort a rebase
Cancel a rebase and return to the starting state.
OpenIn sheetbashsame section
Skip the current patch during rebase
Omit the commit currently being replayed.
OpenIn sheetbashsame section
Check status during rebase
Inspect rebase state and unresolved files.
OpenIn sheetbash3 tag match