git cannot squash commits

Question

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?

possible duplicate of [How do I fix merge conflicts in Git?](http://stackoverflow.com/questions/161813/how-do-i-fix-merge-conflicts-in-git) — Roman, Jan 25 '13 at 02:48
@PRC type `git status` and show us the output, what does it say? — , Aug 10 '13 at 00:19

jasir · Answer 1 · 2013-08-09T22:16:36.757

6

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

edited Aug 09 '13 at 22:16

answered Jan 25 '13 at 12:58

jasir

1,461
11
28

score 0 · Answer 2 · answered Jan 25 '13 at 03:25

0

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.

answered Jan 25 '13 at 03:25

William Seiti Mizuta

7,669
3
31
23

When you typed `__git_ps1`, what did you get? – William Seiti Mizuta Jan 25 '13 at 06:48

git cannot squash commits

2 Answers2