melt
paulnsorensen568 installs
Resolve Git conflicts without losing your branch.
What it does
Resolves Git content conflicts through a staged workflow that preserves the original branch for recovery.
When to use it
Use for content conflicts during merges, rebases, cherry-picks, pulls, or branch integration, not clean operations or review-only questions.
How to use it
Give it a project with a current Git conflict; it resolves the conflicts and continues the operation before asking what should happen next.
What you provide
- An existing project
Uses
Good to know
- cannot be undone: ~/.gitattributes
Latest review
What you need · 2
Requires Python 3 to run the bundled command archive.
Uses mergiraf for structural merging of conflicted files.
Access · 1
This skill
~/.gitattributes
Write
Overwrites your global Git attributes (irreversible)