Skip to content

compile: stop adding ineffective merge=ours to lock.yml .gitattributes entry - #50639

Merged
pelikhan merged 3 commits into
mainfrom
copilot/re-add-merge-ours-to-gitattributes
Aug 5, 2026
Merged

compile: stop adding ineffective merge=ours to lock.yml .gitattributes entry#50639
pelikhan merged 3 commits into
mainfrom
copilot/re-add-merge-ours-to-gitattributes