Feature/fix mainline feature branch bump#1224
Merged
JakeGinnivan merged 5 commits intoGitTools:masterfrom May 21, 2017
Merged
Conversation
This class parses the merge message and exposes all the useful information, like is it a pull request, what was the source and target branch etc.
This example is super hard to support, the way we supported it was by hard coding branch prefixes. Instead scenarios like this should use the ignore-sha feature to remove the merge message from version calculations.
…ration for the merged branch
Contributor
Author
|
This PR includes some nice refactorings to hopefully make things easier to understand, read individual commits for more info. |
Merged
Contributor
Author
|
Going to just merge this, I don't think any of the changes in here are particularly controversial and I really would like good feedback on #1225 which is based on this one. So merging this will cleanup the diff. If anyone wants to review after I merge happy to fix up anything which is found. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Fixes #1221 by using the test in #1223
@mabead