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.

Westernmost

Assuming you're not actually trying to use git am somewhere else, does git am --abort make any difference? – Bagasse

And: is a "git rebase" still possible from command line while not possible from SmartGit? – Bactria

@Bactria Yes, possible from command line while not possible from SmartGit – Westernmost

@Bagasse I think smartgit don't represent command line, so i dont know how to force him to use git am command. I like he by convenient UI. And dont wanna back to GIT bach command line – Westernmost

@Westernmost did you also try with the --preserve-merges options from command line? It would be quite strange to have just SmartGit failing, as it's obviously using command line Git here. That said, I'd recommend to follow the advice of Chris, using command line Gitt to git am --abort. Then the rebase should succeed. – Bactria

Answer 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.

Wellfounded

Issue also seen in SourceTree - and your fix works there too. Thx – Respiratory

Similar error in SourceTree, did git am --continue in dos, and the output message helped: "If there is nothing left to stage, chances are that something else already introduced the same changes; you might want to skip this patch [...] run "git am --skip" instead." Indeed, the same change as my patch was introduced by a merged branch (or I messed up somewhere trying to fix this). Ran git am --skip, all fine now. – Rothstein

Was just applying patches through Sourcetree. --continue is what I needed after manual merging conflicts. – Antifreeze

I had this same problem with Sourcetree. Solved by opening git cli and running this abort command. Worked! – Zaccaria

Answer 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

Soissons

Answer 3

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

Zipah

Answer 4

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

Wilmot