CODEWITHSUNDEEP
gitrebasegit-rebasesmartgit
Ark
Ark

Reputation: 1383

Rebasing in smartgit "git-am is in progress"

I will try to explain the problem that I have. I have used the rebase option via git bash many times. Now I have SmartGit and don’t know why rebase is not correct.

Step 1:

Step 2:

Step 3:

The result is that HEAD detaches.

Upvotes: 70

Views: 53261

Answers (4)

ᴍᴇʜᴏᴠ
ᴍᴇʜᴏᴠ

Reputation: 5256

I got this error error when trying to git pull –rebase origin master.

The accepted git am --abort didn't help, unfortunately, saying:

error: You seem to have moved HEAD since the last 'am' failure.

Not rewinding to ORIG_HEAD

But the good old pull did work (and the rebase started working after it, too):

git pull origin master

Upvotes: 4

Mike Decker
Mike Decker

Reputation: 11

I encountered this in SourceTree, where branches had different .gitignore files. I resolved it by committing a matching .gitignore prior to the merge.

Upvotes: 1

Madhan Ayyasamy
Madhan Ayyasamy

Reputation: 16538

The same issue i have faced, i will delete the local branch in my machine and recreate it from origin each and every time. But finally i got the solution. I ran the below command

git am --abort solved my problem.

Upvotes: 198

Yaakov Ellis
Yaakov Ellis

Reputation: 41510

The only thing that I could do to cancel out the rebase after getting this error message was to delete the .git\rebase-apply folder and all of its contents.

rm .\.git\rebase-apply

Upvotes: 8

Related Questions