Results for “conflict-resolution”
19 skills
mhassan0000 git-workflow
Guides Git version control practices: branching strategies, commit conventions, merge vs rebase, conflict resolution, and pull request workflows for collaborative teams.
1
affaan-m git-workflow
Learn Git workflow patterns including branching strategies, commit conventions, merge vs rebase, conflict resolution, and collaborative development best practices for teams of all sizes.
226k
livelybug git-workflow
Git workflow patterns including branching strategies, commit conventions, merge vs rebase, conflict resolution, and collaborative development best practices for teams of all sizes.
0
anantha-236 git-workflow
Git workflow patterns including branching strategies, commit conventions, merge vs rebase, conflict resolution, and collaborative development best practices for teams of all sizes.
1
More results
lord1egypt nvc
Guides users through Nonviolent Communication to turn emotionally charged thoughts into constructive messages, structuring responses with observation, feeling, need, and request.
2
schattenspiegel problem-solving
Provides a structured methodology for solving nontrivial, ambiguous problems by framing outcomes, selecting evidence, routing specialists, choosing options, and verifying results.
0 · bundle
huuanh20 problem-solving
Provides structured techniques for breaking through stuck points in problem-solving, including collision-zone thinking, inversion, pattern recognition, and simplification.
1 · bundle
dangquangse problem-solving
Provides creative problem-solving techniques for breaking through stuck points, including collision-zone thinking, inversion, pattern recognition, and simplification.
19 · bundle
affaan-m council
Convene a four-voice council of advisors to surface structured disagreement and tradeoffs for ambiguous decisions, go/no-go calls, and multi-path choices.
226k
demerzels-lab jira
Manage Jira issues, boards, sprints, and projects via the jira-cli. Search, create, update, and transition issues directly from the command line.
10 · bundle
seb1n version-control
Manage Git repositories and collaborative workflows — branching strategies, commit hygiene, conflict resolution, pull requests, hooks, and .gitignore management. Use when the user requests version control or provides relevant inputs for this workflow.
159
shenxingy incident
Incident response mode — diagnose a production issue, write a postmortem, add follow-up tasks to TODO.md. Use when user says "/incident [description]".
8
kbarbel640-del jira
Manage Jira issues, boards, sprints, and projects via the jira-cli. Search, create, update, and transition issues directly from the command line.
1 · bundle
auto-skiller council
Convenes a four-voice council of subagents to surface structured disagreement for ambiguous decisions, tradeoffs, and go/no-go calls.
1 · bundle
mhassan0000 council
Convenes four independent advisor voices to surface structured disagreement on ambiguous decisions, tradeoffs, and go/no-go calls before choosing a path.
1
huuanh20 when-stuck-problem-solving-dispatch
Identify the type of problem you're stuck on and dispatch to the appropriate problem-solving technique.
1
majiayu000 tzst
Create, extract, flatten, list, test, install, and script tzst CLI workflows for .tzst or .tar.zst archives, including compression levels, streaming mode, extraction filters, conflict resolution, and JSON output.
567 · bundle
om-scogo tzst
Use when the user needs to create, extract, flatten, list, test, install, script, or troubleshoot `tzst` CLI workflows for `.tzst` or `.tar.zst` archives, including compression levels, streaming mode, extraction filters, conflict resolution, JSON output, or standalone binary setup, even if they describe the archive task without naming `tzst`.
0 · bundle
kintsugi-programmer tzst
Use when the user needs to create, extract, flatten, list, test, install, script, or troubleshoot `tzst` CLI workflows for `.tzst` or `.tar.zst` archives, including compression levels, streaming mode, extraction filters, conflict resolution, JSON output, or standalone binary setup, even if they describe the archive task without naming `tzst`.
0 · bundle