feat: Skip lint when merging remote branch#207
Merged
folke merged 1 commit intofolke:masterfrom Oct 20, 2022
Merged
Conversation
Contributor
Author
|
Dear @folke, we are actively using |
github-actions bot
pushed a commit
that referenced
this pull request
Oct 20, 2022
## [2.4.0](v2.3.2...v2.4.0) (2022-10-20) ### Features * Skip lint when merging remote branch ([#207](#207)) ([55bbef8](55bbef8)) ### Other * **deps:** update dependency conventional-changelog-conventionalcommits to v4.6.3 ([ef024ef](ef024ef)) * **deps:** update dependency minimist to v1.2.6 [security] ([9e7ecb7](9e7ecb7)) * **deps:** update dependency node-fetch to v2.6.6 ([23d00ce](23d00ce)) * **deps:** update dependency node-fetch to v2.6.7 [security] ([3239b8c](3239b8c)) * **deps:** update dependency ts-interface-builder to v0.3.3 ([7c6392f](7c6392f))
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
2 participants
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.
Description
When merging a remote branch
(origin/master)directly into the local branch(feature/branch-abc), the default git commits message will be"Merge remote-tracking branch 'origin/master' into feature/branch-abc".Current lint doesn't cover this use case, so the commit message format is validated against the
conventional commitstandards and getting blocked.This PR includes a
regexto skip the git merge default commit message from linting.