# Merge Resolution

> Merge conflict resolution conventions. Use when resolving git merge conflicts, especially in dependency files and lock files. Use when this capability is needed.

- Skill: `tomevault-io/merge-resolution` (Agent Skill, multi-file: 2 files)
- Install (CLI): `npx skillmds@latest add tomevault-io/merge-resolution`
- Raw SKILL.md: https://api.skillmd.com/api/skills/tomevault-io/merge-resolution/raw
- Safety review: pending (external: skill-scanner PASS, skillspector PASS)
- Works with: Claude Code, Claude.ai, OpenAI Codex
- Category: Coding & Dev Tools
- Author: tomevault-io (https://skillmd.com/u/tomevault-io)
- Updated: 2026-09-17
- Page: https://skillmd.com/skills/tomevault-io/merge-resolution

---


# 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:
```bash
# 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

```bash
git diff --check           # No whitespace issues
grep -r "<<<<<<" .         # No remaining markers
```

---
> Converted and distributed by [TomeVault](https://tomevault.io/claim/vectorinstitute) — claim your Tome and manage your conversions.
<!-- tomevault:4.0:skill_md:2026-04-15 -->