Revert "Set --incompatible_strict_conflict_checks=false" (#1773)

Reverts #1771 This was reverted in bazel for now, so in case it's flipped again we want CI to catch it
bazelbuild · Nov 29, 2022 · eaa06c1 · eaa06c1
1 parent f4e8c0f
commit eaa06c1
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -7,8 +7,6 @@ common --incompatible_allow_tags_propagation
 # TODO: Fix cases that relied on the old behavior and remove this flag.
 common --incompatible_unambiguous_label_stringification=false
 
-build --incompatible_strict_conflict_checks=false
-
 # Add the PATH to the test environment so that common macOS tools can be found
 # during a test run.
 build --test_env=PATH