dev@local: ~/project — git
dev@local~/project$git status
error: rebase in progress
hint: You must edit all merge conflicts and then
hint: mark them as resolved using git add
hint: then run 'git rebase --continue'
Diagnostics Translation
You tried to run a Git command while a previous rebase operation is still paused.
waiting for resolution...
LowVersion Control System

Reviewed for reference consistency: April 11, 2026

Code is Safe

SECURE

Git has paused the operation to protect your code. No data has been lost or corrupted.

What To Know

This message means the repository is already inside a history-replay workflow, so ordinary commit flow is paused until that state finishes or is abandoned.

Where Did It Fail?

Working Tree
Your local files
add
Staging Index
Prepared changes
commit
Local Repo
Commit history
push/fetch
Remote Server
GitHub/GitLab
The error involves the internal Git database or commit history structure.

Commands That Trigger This

$git status
Running or `git commit` days after abandoning a difficult merge conflict
$git pull
Attempting a new when a previous pull with `--rebase` failed

Technical Background

01

Git prevents you from branching off or pulling new code while in the middle of rewriting history.

02

The `git status` command will explicitly list instructions on how to either continue, skip the commit, or abort the entire process.

Underlying Causes

Closing the terminal while resolving a rebase conflict and forgetting about it
Trying to `git checkout` or `git pull` while a rebase is waiting for you to type `git rebase --continue`
Switching branches mid-rebase without aborting the process

Frequently Asked Questions

No, `git rebase --abort` simply undoes the rebase attempt and safely puts your branch exactly back where it was before you started.

Related Git States

could-not-apply-commitMedium

Git stopped a rebase or cherry-pick because the commit conflicts with your current code.

patch-failedMedium

Git could not apply a patch file because the target code has changed too much.

unmerged-pathsLow

You have unresolved file conflicts preventing Git from completing the current operation.