commit 24ef85f2f7aa827eeb4595e93b0a0985409d84f4
author Fabian Meumertzheim <fabian@meumertzhe.im> Wed Jun 19 00:25:43 2024 -0700
committer Copybara-Service <copybara-worker@google.com> Wed Jun 19 00:29:03 2024 -0700
tree db423799f7aa491c5e3426745fe0eba440f7c4f2
parent b5c273acbbaea9dbf6c218ec98b1310e0dde442e

Use `bazel-lockfile-merge` tool

Closes #22788.

PiperOrigin-RevId: 644648328
Change-Id: I7c068fad93f4a753d40a352ea009aa73b25fdf82

.gitattributes

diff --git a/.gitattributes b/.gitattributes
index 35e4e72..e2836a9 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -4,3 +4,7 @@
 
 # Files that should not use CRLF line endings, even on Windows.
 tools/genrule/genrule-setup.sh -text
+
+# A custom merge driver for the Bazel lockfile.
+# https://bazel.build/external/lockfile#automatic-resolution
+MODULE.bazel.lock merge=bazel-lockfile-merge