From b41adc6cd620d5f3aa065d9e5b1efd3a383950d8 Mon Sep 17 00:00:00 2001 From: Malte Poll <1780588+malt3@users.noreply.github.com> Date: Wed, 22 May 2024 10:42:36 +0200 Subject: [PATCH] gitignore MODULE.bazel.lock The lockfile in it's current form is prone to generate complex merge conflicts. See https://github.com/bazelbuild/bazel/issues/20369 Also, the bazel central registry never removes or alters existing versions. The lockfile can probably be added to Git in Bazel >= 7.2 --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 27a599676c4..89bb254a328 100644 --- a/.gitignore +++ b/.gitignore @@ -60,6 +60,7 @@ __pycache__/ # Bazel /bazel-* .bazeloverwriterc +MODULE.bazel.lock # mkosi .mkosi-tmp*