Add script for automated 'pu' branch creation#4
Open
sauerj wants to merge 1 commit intorocketraman:masterfrom
Open
Add script for automated 'pu' branch creation#4sauerj wants to merge 1 commit intorocketraman:masterfrom
sauerj wants to merge 1 commit intorocketraman:masterfrom
Conversation
Automated creation of a 'proposed-updates' branch speeds up the gitworkflow. The script follows the gitworkflow rules to create a 'proposed-updated' branch. Topic branches which are already merged into 'next' will be merged into 'pu'. Followed by topic branches which are currently not integrated in 'next'. Branches which are merged in 'master' or have a leading 'wip' will be ignored. On merge conflicts the script will exit. The user can then fix the merge conflict. git-rerere will help to reuse the solution on the next run of 'create-pu'.
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.
Here the script I mentioned in #3
Just take a look and tell me what you think about it.