Skip to content

Commit 95da7be

Browse files
authored
[Pulldown] Always use ours when merging from other branches for CODEOWNERS (#11496)
This is to tell git merge.ours driver to always use sycl version. It should be a nop op for default merge strategy. To use merge.ours driver, you can set it in config once. git config --global merge.ours.driver true This is to avoid trivial conflict in CODEOWNERS break pulldown automation.
1 parent 0508a19 commit 95da7be

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.github/CODEOWNERS merge=ours

0 commit comments

Comments
 (0)