Home/ Questions/Q 9001311
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-06-16T00:25:11+00:00

So I forked an open source project, and sent in a bugfix last week

  • 0

So I forked an open source project, and sent in a bugfix last week that was not pulled into their master. I created that fix on a separate branch, rebased it on top of upstream’s master, and issued a pull request from that branch. However, I then began work on a new issue, but mistakenly created this new issue’s branch off of the branch I created for the original bugfix.

So now I have that commit directly below mine in the branch I’d like to push up and issue a pull request to. I fetched and merged all updates to upstream/master into my master branch, and I’d like to rebase this new commit on top and send it up, but due to that older bugfix commit, trying to rebase creates a conflict.

What is the best way to deal with this?

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    (As stated in my comment, ) The solution would be to soft reset the commit (git reset --soft HEAD^), stash it with git stash save and then switch to the correct HEAD via rebase, checkout or whichever way you prefer or have to use.

    After this, a simple git stash apply should recover your work from the stash.

    • 0