Can you avoid the merge commit up above? Your master has probably deviated with this repo, requiring the merge before your pull request bases correctly for this repository.
But, pull requests should never contain merge commits. Can you instead add the upstream remote:
git add remote upstream http://github.com/kleiram/transmission-php
fetch it's master:
git fetch upstream master
create a new branch, with upstream/master as the base:
git checkout upstream/master -b metadata-percent-complete
cherry pick your commit:
git cherry-pick e89b56f1ac8fb79db31594611a641658c502d4dd
And that should work, unless there's a merge conflict somehow address in the merge, just run your tests and see. If you plan to contribute often, you shouldn't merge to your master until upstream merges, then you won't have these merge commits.
Can you avoid the merge commit up above? Your
masterhas probably deviated with this repo, requiring the merge before your pull request bases correctly for this repository.But, pull requests should never contain merge commits. Can you instead add the upstream remote:
git add remote upstream http://github.com/kleiram/transmission-phpfetch it's master:
git fetch upstream mastercreate a new branch, with
upstream/masteras the base:git checkout upstream/master -b metadata-percent-completecherry pick your commit:
git cherry-pick e89b56f1ac8fb79db31594611a641658c502d4ddAnd that should work, unless there's a merge conflict somehow address in the merge, just run your tests and see. If you plan to contribute often, you shouldn't merge to your master until upstream merges, then you won't have these merge commits.