---

name: merge-resolution description: Merge conflict resolution conventions. Use when resolving git merge conflicts, especially in dependency files and lock files.

Merge Resolution

Version Conflicts

Prefer newer versions:

Copy<<<<<<< HEAD
"package": "^2.0.0"
=======
"package": "^1.9.0"
>>>>>>>
# Resolve to: "^2.0.0"

Lock Files

Never manually resolve. Regenerate:

Copy# Python
rm uv.lock && uv lock

# Node.js
rm package-lock.json && npm install

Pre-commit Config

For .pre-commit-config.yaml, prefer newer hook versions from the update branch.

Validation

Copygit diff --check           # No whitespace issues
grep -r "<<<<<<" .         # No remaining markers