Fixes #6850: Add the ability to branch on a PR instead of a release branch #64
Conversation
This file contains 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
|
ping @VinceMacBuche |
| @@ -839,15 +868,26 @@ def amend(comment=None): | |||
|
|
|||
|
|
|||
| # rebase, push -f, comment PR | |||
| def rebase(comment=None): | |||
| def rebase(comment=None, base=None): | |||
| info = ticket_from_branch(current_branch) | |||
| master_branch = branch_from_version(info['version']) | |||
There was a problem hiding this comment.
could you rename master_branch into "rebase_branch" (or another) ? just to be sure that the branch is not the master branch but the branch the rebase should be made on
|
PR updated |
peckpeck
force-pushed
the
ust_6850/add_the_ability_to_branch_on_a_pr_instead_of_a_release_branch
branch
from
cf20be6
to
d43232c
Compare
VinceMacBuche
added a commit
that referenced
this pull request
Jul 27, 2015
…ch_on_a_pr_instead_of_a_release_branch Fixes #6850: Add the ability to branch on a PR instead of a release branch
peckpeck
deleted the
ust_6850/add_the_ability_to_branch_on_a_pr_instead_of_a_release_branch
branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
https://www.rudder-project.org/redmine/issues/6850