-
Notifications
You must be signed in to change notification settings - Fork 913
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(is-ignored): ignore merge tag commit messages (#2920)
Merging a tag in another branch can lead to conflicts. In this case, the default Git commit message after resolving the conflicts will be like: `Merge tag 'x.y.z'` Currently, this commit message format is being considered as an error. So I updated the wildcards to get a consistent behavior between branch and tag merge: - `Merge branch 'a branch'` - `Merge branch 'a tag'`
- Loading branch information
1 parent
f21eb16
commit 914782a
Showing
2 changed files
with
25 additions
and
0 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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