Ok so I an contributing to a project on github. The project on github is upstream
, my forked repo on github is origin
, and my local
repo on my computer.
git checkout -b feature
# Working on feature
git commit -a -m 'only commit on feature'
then I submit a pull request
git push origin master
The pull request is reviewed and a unrelated change needs to be made. Someone else makes a commit and merge into upstream/master
Now I am asked by the upstream
maintainer to "rebase my pull request on top of master"
This is my story (insert Law and Order sound effect).....
I did not make any changes to the pull request and its still the same commit on branch feature.
git checkout master
git fetch upstream
git checkout feature
git rebase master
=> "Current branch feature is up to date."
git push origin feature
=> "Everything up-to-date"
I don't understand. How is this possible when I know that someone committed and merged to upstream/master
after I pushed my pull request to origin/feature
?
Can anyone tell me what the correct procedure should be in this situation?