Skip to content

Commit

Permalink
fix: MODULE.bazel.lock conflicts
Browse files Browse the repository at this point in the history
See bazelbuild/bazel#20369

While working on refactoring, I kept hitting rebase conflicts due to
issues with the MODULE lock. I guess it's because the Bazel version in
e2e tests is much lower than the current one with the fix (7.2) but
still, I don't think it adds much to have the lock in e2e testing.
  • Loading branch information
jjmaestro committed Sep 18, 2024
1 parent 2ce7b47 commit fba8b43
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4,321 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# ignoring e2e MODULE.bazel.lock for the time being
# see https:/bazelbuild/bazel/issues/20369
e2e/smoke/MODULE.bazel.lock
bazel-*
.bazelrc.user
.idea/
Expand Down
Loading

0 comments on commit fba8b43

Please sign in to comment.