CODEWITHSUNDEEP
gitrebase
Pan Ruochen
Pan Ruochen

Reputation: 2080

git cannot squash commits

I cannot squash commits with git rebase -i command, getting the following error message.

error: could not apply 3ad5c7b... 

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To check out the original branch and stop rebasing run "git rebase --abort".

What is the error and how to resolve it?

Upvotes: 10

Views: 18798

Answers (2)

jasir
jasir

Reputation: 1471

Git failed to merge automatically. Try git mergetool and resolve conflicts, then continue your rebase with git rebase --continue

Upvotes: 6

William Seiti Mizuta
William Seiti Mizuta

Reputation: 7995

Probably you have used a git rebase before and didn't completed it. To verify it, type __git_ps1 and verify if the word rebase appear. To resolve this, you need to abort the earlier rebase with git rebase --abort and the apply the rebase you want.

Upvotes: 0

Related Questions