resolving-merge-conflicts
This skill offers a systematic approach to efficiently resolve Git merge or rebase conflicts. It guides developers through inspecting history, identifying conflict sources, precisely handling each hunk, and ensuring automated checks pass. This significantly reduces the time and errors associated with manual conflict resolution, ensuring a clean codebase and smooth project progression.
npx skills add https://github.com/mattpocock/skills --skill resolving-merge-conflictsBefore / After Comparison
1 组Without clear guidance, developers manually resolving Git merge conflicts often spend excessive time, easily miss critical changes, or introduce new errors. This leads to an unstable codebase, frequent rework, and significantly hinders development efficiency and team collaboration.
This skill provides clear steps and best practices, helping developers quickly locate and accurately resolve conflicts. This skill ensures each conflict resolution follows standards, reducing rework and errors, and significantly improving the success rate of code merges and the smoothness of the development process.
-
See the current state of the merge/rebase. Check git history, and the conflicting files.
-
Find the primary sources for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check original issues/tickets.
-
Resolve each hunk. Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do not invent new behaviour. Always resolve; never
--abort. -
Discover the project's automated checks and run them — typically typecheck, then tests, then format. Fix anything the merge broke.
-
Finish the merge/rebase. Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.
User Reviews (0)
Write a Review
No reviews yet
Statistics
User Rating
Rate this Skill