conflict-resolver

To resolve git merge conflicts file by file, this Skill inspects diffs and presents per-file resolution options via interactive prompts, allowing you to review and apply changes to each file individually before staging and committing. It guides you through the entire process safely.

Yes, you can resolve conflicts during a git rebase or cherry-pick. This Skill safely guides per-file conflict resolutions across rebase, merge, stash, and cherry-pick operations, detecting conflict types and presenting safe options before applying changes to your repository.

The best way to handle multi-file git conflicts in collaborative projects is using a guided per-file resolution process. This Skill inspects diffs for each conflicting file and prompts you to choose resolutions individually, ensuring every file is reviewed before applying and committing changes.

Yes, this git conflict resolver works with stash operations. It supports resolving conflicts that arise during git stash apply or pop, guiding you through per-file decisions and staging the chosen resolutions before completing the operation.

To review git diffs before resolving each conflict, this Skill inspects the diff for every conflicting file and presents resolution options through interactive prompts. You evaluate each file's changes and select the appropriate resolution before the Skill stages and commits the result.

After you choose how to resolve each conflicting file in git, the Skill stages the selected resolutions and commits them to finalize the merge, rebase, stash, or cherry-pick operation. This ensures your chosen changes are safely applied to the repository.