Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add script for automated 'pu' branch creation #4

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

sauerj
Copy link

@sauerj sauerj commented May 3, 2018

Here the script I mentioned in #3
Just take a look and tell me what you think about it.

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'.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant