Fixes #13386: Add squash merge option to rudder-dev #404
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
scripts/rudder-dev/rudder-dev-src
Outdated
| @@ -174,6 +174,7 @@ MERGE | |||
| When we reach this version, use -s ours to avoid upmerging to later branches. | |||
| - detect the ticket id from current branch if there is no parameter | |||
| - checkout an pull last version or the PR branch for a given ticket | |||
| - automatically fuxup commits on the PR branch unless --no-autosquash is provided | |||
peckpeck
force-pushed
the
ust_13386/add_squash_merge_option_to_rudder_dev
branch
from
4fb15f2
to
def22ad
Compare
|
Commit modified |
VinceMacBuche
approved these changes
Sep 3, 2018
|
OK, merging this PR |
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/13386