Git Pull 'Rebase in Progress' Issue

When I tried to pull a Git repository with SourceTree, I encountered the following error:

Rebase In Progress

It appears that you have a rebase in progress that was probably interrupted because of a conflict. If you’ve resolved the conflicts in your working copy, please choose whether to continue the rebase or abort this process where you are now.

I didn’t remember whether I had been doing a Git rebase before. But well, let’s try to fix it in the Terminal.

I decided to abort the rebase using the git rebase --abort command:

$ git rebase --abort
fatal: It looks like 'git am' is in progress. Cannot rebase.

However, this resulted in a fatal error.

At this point, I realized what was causing the issue. All I needed to do was execute the git am --abort command:

$ git am --abort
warning: You seem to have moved HEAD since the last 'am' failure.
Not rewinding to ORIG_HEAD

Although there was a warning, it wasn’t a problem. I was finally able to pull the Git repository again.

Conclusion

That’s it for the solution!

Thanks for reading, and see you next time.