Question

When I do a ‘git pull’, I have conflict with the head commit. So I did a ‘git rebase –abort’

Can I ‘save’ my commit to a “patch” and then do a git pull?

What I want to emulate is:

• I did not commit, but I did a ‘git stash’ instead
• Do a git pull to avoid any merge error

So I need somehow to ‘turn back the clock’. Is that possible with git?

Answer 1

Your 7826b2 patch will still cause a conflict when it’s applied after pulling, but you can do the following:

git reset --soft HEAD^
git stash
git pull
git stash pop # Will cause a conflict
git commit    # Re-commit 7826b2

Another workflow is also possible:

git reset --hard HEAD^
git pull
git cherry-pick 7826b2 # Will cause a conflict

The second workflow relies on the fact that Git keeps the 7826b2 commit in the reflog (you can think of it as the recycle bin) even though you reset the changes it introduced with the first line.