[Pulldown] Always use ours when merging from other branches for CODEOWNERS #11496
Conversation
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
…WNERS This it 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.
bader
approved these changes
Oct 10, 2023
Contributor
Author
|
Thanks @bader . @intel/llvm-gatekeepers Can we get this merged. Thanks. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
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.