You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.