From 72e9bb05ca5ef08e21fd1ec8651efc66cc03ac1f Mon Sep 17 00:00:00 2001 From: Max Holman Date: Sat, 17 Oct 2026 20:24:01 +0800 Subject: [PATCH] chore(git): never merge a lockfile A lockfile merged line by line can disagree with its manifests while looking clean, so a conflicting change stops instead and is regenerated. Co-Authored-By: LLM --- .gitattributes | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitattributes b/.gitattributes index ea926c4b670e5..2e4bda7077632 100644 --- a/.gitattributes +++ b/.gitattributes @@ -16,3 +16,7 @@ apps/oxlint/test/fixtures/** text=auto eol=lf crates/oxc_linter/src/generated/rules_enum.rs linguist-generated=true merge=ours crates/oxc_linter/src/generated/rule_runner_impls.rs linguist-generated=true merge=ours crates/oxc_linter/src/generated/assert_layouts.rs linguist-generated=true + +# never merge a lockfile +pnpm-lock.yaml -merge +Cargo.lock -merge