tomevault-io Merge Resolution
Version Conflicts
Prefer newer versions:
<<<<<<< HEAD
"package": "^2.0.0"
=======
"package": "^1.9.0"
>>>>>>>
# Resolve to: "^2.0.0"
Lock Files
Never manually resolve. Regenerate:
# 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
git diff --check # No whitespace issues
grep -r "<<<<<<" . # No remaining markers
Converted and distributed by TomeVault — claim your Tome and manage your conversions.