Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add --incompatible_strict_conflict_checks to .bazelrc #1861

Merged
merged 1 commit into from
Feb 24, 2023

Conversation

tjgq
Copy link
Contributor

@tjgq tjgq commented Feb 24, 2023

To prevent backsliding. See bazelbuild/bazel#16729 for context.

@brentleyjones brentleyjones changed the title Add --incompatible_strict_conflict_checks to .bazelrc. Add --incompatible_strict_conflict_checks to .bazelrc Feb 24, 2023
@tjgq tjgq marked this pull request as ready for review February 24, 2023 19:27
@keith keith enabled auto-merge (squash) February 24, 2023 19:36
@tjgq
Copy link
Contributor Author

tjgq commented Feb 24, 2023

We have to use --experimental_strict_conflict_checks as the --incompatible_strict_conflict_checks alias didn't make it into 6.0.0. I'll make sure it gets cherry picked into 6.1.0.

auto-merge was automatically disabled February 24, 2023 19:39

Head branch was pushed to by a user without write access

@brentleyjones brentleyjones merged commit def482e into bazelbuild:master Feb 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants