Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Do not warn unnecessarily for namespace conflicts (#4363)
* Do not warn for hidden namespace conflicts * Merge conflict detection into export resolution
- Loading branch information
1 parent
3ca594e
commit 9eeb6a0
Showing
15 changed files
with
131 additions
and
128 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
Oops, something went wrong.