Commit 95da7be
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
1 file changed
+1
-0
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
0 commit comments