Inspect rebase state and unresolved files.
Section: Rebase Conflicts and Recovery
Check status during rebase
bash
bash
git statusExplanation
Git status gives the clearest view of what remains to be resolved during a paused rebase.
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 Rebase Conflicts and Recovery
Enable rerere globally
Reuse recorded conflict resolutions in future rebases and merges.
Take ours side for a conflicted file
Resolve one conflicted path using the current branch side.
Take theirs side for a conflicted file
Resolve one conflicted path using the incoming side.
Find pre-rebase state in reflog
Locate the branch state before an unwanted rebase.
Continue rebase after resolving conflicts
Resume the rebase once conflicts are fixed.