Menü
Merge conflict resolution conventions. Use when resolving git merge conflicts, especially in dependency files and lock files.
Mit Codex oder Claude installieren Kopieren Sie diesen Prompt, fügen Sie ihn in Codex, Claude oder einen anderen Assistant ein und lassen Sie die Skill-Seite prüfen und installieren.
Basierend auf der SOC-Berufsklassifikation
Fix pip-audit security vulnerability failures. Use when CI fails due to pip-audit findings (CVE/GHSA). Handles both fixable and unfixable (upstream-only) vulnerabilities with graceful exit.
Python tooling conventions for this organization. Use when working with Python projects, fixing linting issues, or managing dependencies.
| name | merge-resolution |
| description | Merge conflict resolution conventions. Use when resolving git merge conflicts, especially in dependency files and lock files. |
Prefer newer versions:
<<<<<<< HEAD
"package": "^2.0.0"
=======
"package": "^1.9.0"
>>>>>>>
# Resolve to: "^2.0.0"
Never manually resolve. Regenerate:
# Python
rm uv.lock && uv lock
# Node.js
rm package-lock.json && npm install
For .pre-commit-config.yaml, prefer newer hook versions from the update branch.
git diff --check # No whitespace issues
grep -r "<<<<<<" . # No remaining markers