resolve-git-conflicts
Resolve git merge conflicts, rebase conflicts, cherry-pick conflicts, and stash pop conflicts. Use when git status shows "unmerged paths", "rebase in progress", "cherry-pick in progress", or after failed stash pop. Handles overlapping edits, edit/delete conflicts, rename conflicts, binary conflicts, and helps user choose between ours/theirs or manual merge.
Installation
Suivez les instructions du dépôt pour votre agent. Consultez les fichiers et dépendances avant l’installation.
Voir la source ↗GuidesInstructions
Fonctions et usage
Resolve git merge conflicts, rebase conflicts, cherry-pick conflicts, and stash pop conflicts. Use when git status shows "unmerged paths", "rebase in progress", "cherry-pick in progress", or after failed stash pop. Handles overlapping edits, edit/delete conflicts, rename conflicts, binary conflicts, and helps user choose between ours/theirs or manual merge.
Démarrage rapide
Suivez les instructions du dépôt pour votre agent. Consultez les fichiers et dépendances avant l’installation.
Guides ↗Exemples
Consultez les exemples du dépôt source.
Voir la source ↗Historique source
- Date d’indexation
- 2026-01-24
- Mise à jour de l’index
- 2026-01-24
- Branch
- main
Les dates concernent ce répertoire. Consultez le dépôt pour l’historique du code.
GitHub ↗chat Comments (0)
Sign in to join the discussion and leave a comment.
No comments yet. Be the first to share your thoughts!