Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added support for metadataPercentComplete #63

Open
wants to merge 5 commits into
base: master
Choose a base branch
from

Conversation

bilalghouri
Copy link
Contributor

No description provided.

@afk11
Copy link
Contributor

afk11 commented Nov 19, 2016

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants