Skip to content

Commit 943b1b6

Browse files
Exclude NOTICE files from merge conflict detection. (#8498) (#8534)
(cherry picked from commit d3bc5d9) Co-authored-by: Craig MacKenzie <[email protected]>
1 parent 86104bd commit 943b1b6

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ repos:
88
exclude: (.*/.*.(tmpl|tftpl)$)
99
- id: check-merge-conflict
1010
args: ['--assume-in-merge']
11+
exclude: (^NOTICE.*\.txt$)

0 commit comments

Comments
 (0)