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

fix(CommitMessage): merge branch and tag syntax was failing with GitFlow #830

Merged
merged 1 commit into from Oct 23, 2020
Merged

fix(CommitMessage): merge branch and tag syntax was failing with GitFlow #830

merged 1 commit into from Oct 23, 2020

Conversation

williarin
Copy link
Contributor

Q A
Branch master
Bug fix? yes
New feature? no
BC breaks? no
Deprecations? no
Documented? no
Fixed tickets

GitFlow uses this syntax automatically when merging branches:
Merge release 'x.y.z'
Merge tag 'x.y.z' into develop

This PR fixes GrumPHP failing when merging a GitFlow branch with git flow release finish.

…Flow

GitFlow uses this syntax automatically when merging branches:
Merge release 'x.y.z'
Merge tag 'x.y.z' into develop
@veewee veewee added this to the 1.1.0 milestone Oct 23, 2020
@veewee
Copy link
Contributor

veewee commented Oct 23, 2020

Looks good. Thanks @williarin !

@veewee veewee merged commit 3617fed into phpro:master Oct 23, 2020
@williarin williarin deleted the fix_commit_message_gitflow branch October 23, 2020 14:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants