Rebasing in smartgit "git-am is in progress"

Question

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.

Solution 1

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.

Solution 2

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

Solution 3

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