Igor Kromin |   Consultant. Coder. Blogger. Tinkerer. Gamer.

So recently I had a problem with SourceTree. It was stuck in the 'Rebase' state for one of my repositories and I had no way from within SourceTree to abort the rebase. There was an easy fix for this issue via the command line however.

The repository browser was showing my repository in the 'Rebase' state...
srctreerebase_1.png


Whenever I tried to Pull, I'd get a dialog box, "Rebase In Progress" that had options to Abort Rebase, Cancel and Continue Rebase.
srctreerebase_3.png


Every time I selected Abort Rebase, it would show the abort progress dialog but nothing else would happen. Selecting Abort from the Actions menu had no effect either. The repository was stuck.
srctreerebase_4.png


This is when I decided that SourceTree couldn't be trusted to complete this task and I had to do it manually via the command line...
srctreerebase_5.png


Entering "git am --abort" did the trick and my repository went back to its normal state.



-i

Skip down to comments...
A quick disclaimer...

Although I put in a great effort into researching all the topics I cover, mistakes can happen. If you spot something out of place, please do let me know.

All content and opinions expressed on this Blog are my own and do not represent the opinions of my employer (Oracle). Use of any information contained in this blog post/article is subject to this disclaimer.
 
comments powered by Disqus
Other posts you may like...