21 skills · sorted by relevance
Resolve merge conflicts in generated workflow lock files by rebuilding them from merged Markdown sources. The skill checks for leftover conflict markers, stages regenerated files, and verifies that unresolved paths and whitespace errors are cleared.
Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution
The English summary is being prepared. Showing the original description.
Resolve an in-progress Git merge or rebase conflict while preserving the relevant intent of both sides. Use when conflict markers or an interrupted merge/rebase need investigation and resolution.
The English summary is being prepared. Showing the original description.
Use when you need to resolve an in-progress git merge/rebase conflict.
The English summary is being prepared. Showing the original description.
Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution
The English summary is being prepared. Showing the original description.
Use when you need to resolve an in-progress git merge/rebase conflict.
The English summary is being prepared. Showing the original description.
Use when you need to resolve an in-progress git merge/rebase conflict.
The English summary is being prepared. Showing the original description.
Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution
The English summary is being prepared. Showing the original description.
Resolve merge and rebase conflicts with safe recovery strategies. Covers identifying conflict sources, reading conflict markers, choosing resolution strategies, and continuing or aborting operations safely. Use when a git merge, rebase, cherry-pick, or stash pop reports conflicts, when a git pull results in conflicting changes, or when you need to safely abort and restart a failed merge or rebase operation.
The English summary is being prepared. Showing the original description.
Use when a merge, rebase, cherry-pick, or stash pop stops on conflicts. Not for people-mediation conflicts: use culture-conflict-mediation.
The English summary is being prepared. Showing the original description.
Use when you need to resolve an in-progress git merge/rebase conflict.
The English summary is being prepared. Showing the original description.
Use when you need to resolve an in-progress git merge/rebase conflict.
The English summary is being prepared. Showing the original description.
Resolves an in-progress git merge/rebase conflict: reads conflict state, recovers each side's intent, resolves hunks, runs checks. NOT for the ship pipeline (mk:ship); NOT for bug debugging (mk:fix).
The English summary is being prepared. Showing the original description.
GitHub project management via gh CLI: issues, Projects v2 boards, labels, milestones, handoff summaries. NOT for code review (mk:review-pr), PR creation, or git ops (mk:resolving-merge-conflicts).
The English summary is being prepared. Showing the original description.
Resolve an in-progress git merge or rebase conflict end to end: read the conflict state, recover each side's original intent, resolve every hunk, run the project's checks, and prepare the merge/rebase for an explicitly approved finish. Use when asked to "resolve merge conflicts", "fix this rebase", "finish the merge", or when `git status` shows conflicted (unmerged) paths. NOT for the full ship pipeline that merges the base branch first (see mk:ship); NOT for debugging a runtime bug or test failure unrelated to a conflict (see mk:investigate / mk:fix).
The English summary is being prepared. Showing the original description.
GitHub project management via the gh CLI — create and triage issues, manage GitHub Projects v2 boards (add items, update status fields), manage labels and milestones, and generate handoff-status summaries. Use when "create a GitHub issue", "add to project board", "update sprint status", "create label/milestone", or "give me a handoff summary of open work". NOT for code review (see mk:review-pr); NOT for PR creation (see mk:ship); NOT for git operations (see mk:ship / mk:resolving-merge-conflicts).
The English summary is being prepared. Showing the original description.
Use when the user has merge conflicts or says "resolve conflicts". Understands conflict markers, resolution strategies, and verification workflow.
The English summary is being prepared. Showing the original description.
Use when you need to resolve an in-progress git merge/rebase conflict.
The English summary is being prepared. Showing the original description.
Use when you need to resolve an in-progress git merge/rebase conflict.
The English summary is being prepared. Showing the original description.
Use when you need to resolve an in-progress git merge/rebase conflict.
The English summary is being prepared. Showing the original description.
Use when you need to resolve an in-progress git merge/rebase conflict.
The English summary is being prepared. Showing the original description.