search

phpro / grumphp

A PHP code-quality tool
MIT License
4.14k stars 430 forks source link

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

Closed williarin closed 3 years ago

williarin commented 3 years ago
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.

veewee commented 3 years ago

Looks good. Thanks @williarin !