Rtk Skill
sopaco/deepwiki-rs
A skill your agent uses when running shell commands that produce verbose output (git, test, build, lint, package managers, docker).
A skill your agent uses when merging or cherry-picking changes cause git conflicts.
Install Resolving Conflicts
$ npx skills add dotnet/dotnet-docker --skill resolving-conflicts -a claude-codeProject install by default; add -g for ~/.claude/skills/.
$ gh skill install dotnet/dotnet-docker resolving-conflicts --agent claude-codeProject scope by default; add --scope user for a personal install. Needs GitHub CLI 2.90.0 or later (public preview).
$ git clone --depth 1 https://github.com/dotnet/dotnet-docker.git skills-src && mkdir -p .claude/skills && cp -r skills-src/.agents/skills/resolving-conflicts .claude/skills/resolving-conflicts && rm -rf skills-srcUse ~/.claude/skills/ instead of .claude/skills for a personal install. The folder must contain SKILL.md.
Claude Code skills documentation · loads skills from .claude/skills/
Install the "resolving-conflicts" agent skill from https://github.com/dotnet/dotnet-docker/tree/main/.agents/skills/resolving-conflicts into .claude/skills/resolving-conflicts/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "resolving-conflicts", then confirm the skill loads.Claude Code copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$skill-installer install https://github.com/dotnet/dotnet-docker/tree/main/.agents/skills/resolving-conflictsType this inside Codex. $skill-installer <name> installs a curated skill from openai/skills. The installer writes to $CODEX_HOME/skills (default ~/.codex/skills). Restart Codex if the skill does not show up.
$ npx skills add dotnet/dotnet-docker --skill resolving-conflicts -a codexProject install goes to .agents/skills/; add -g for ~/.codex/skills/.
$ gh skill install dotnet/dotnet-docker resolving-conflicts --agent codexProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/dotnet/dotnet-docker.git skills-src && mkdir -p .agents/skills && cp -r skills-src/.agents/skills/resolving-conflicts .agents/skills/resolving-conflicts && rm -rf skills-srcUse ~/.agents/skills/ instead of .agents/skills for a personal install.
Codex skills documentation · loads skills from .agents/skills/
Install the "resolving-conflicts" agent skill from https://github.com/dotnet/dotnet-docker/tree/main/.agents/skills/resolving-conflicts into .agents/skills/resolving-conflicts/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "resolving-conflicts", then confirm the skill loads.Codex copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ npx skills add dotnet/dotnet-docker --skill resolving-conflicts -a cursorProject install goes to .agents/skills/; add -g for ~/.cursor/skills/.
$ gh skill install dotnet/dotnet-docker resolving-conflicts --agent cursorProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/dotnet/dotnet-docker.git skills-src && mkdir -p .cursor/skills && cp -r skills-src/.agents/skills/resolving-conflicts .cursor/skills/resolving-conflicts && rm -rf skills-srcUse ~/.cursor/skills/ instead of .cursor/skills for a personal install.
Cursor skills documentation · loads skills from .cursor/skills/, .agents/skills/, .claude/skills/, .codex/skills/
Install the "resolving-conflicts" agent skill from https://github.com/dotnet/dotnet-docker/tree/main/.agents/skills/resolving-conflicts into .cursor/skills/resolving-conflicts/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "resolving-conflicts", then confirm the skill loads.Cursor copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ gemini skills install https://github.com/dotnet/dotnet-docker.git --path .agents/skills/resolving-conflicts--scope user (default) or --scope workspace; --path is the subfolder of the repo that holds the skill; --consent skips the security confirmation prompt.
$ npx skills add dotnet/dotnet-docker --skill resolving-conflicts -a gemini-cliProject install goes to .agents/skills/; add -g for ~/.gemini/skills/.
$ gh skill install dotnet/dotnet-docker resolving-conflicts --agent gemini-cliProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/dotnet/dotnet-docker.git skills-src && mkdir -p .gemini/skills && cp -r skills-src/.agents/skills/resolving-conflicts .gemini/skills/resolving-conflicts && rm -rf skills-srcUse ~/.gemini/skills/ instead of .gemini/skills for a personal install, then run /skills reload.
Gemini CLI skills documentation · loads skills from .gemini/skills/, .agents/skills/
Install the "resolving-conflicts" agent skill from https://github.com/dotnet/dotnet-docker/tree/main/.agents/skills/resolving-conflicts into .gemini/skills/resolving-conflicts/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "resolving-conflicts", then confirm the skill loads.Gemini CLI copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ gh skill install dotnet/dotnet-docker resolving-conflictsInstalls for Copilot at project scope by default; add --scope user for a personal install. Preview a skill first with gh skill preview. Needs GitHub CLI 2.90.0 or later (public preview).
$ npx skills add dotnet/dotnet-docker --skill resolving-conflicts -a github-copilotProject install goes to .agents/skills/; add -g for ~/.copilot/skills/.
$ git clone --depth 1 https://github.com/dotnet/dotnet-docker.git skills-src && mkdir -p .github/skills && cp -r skills-src/.agents/skills/resolving-conflicts .github/skills/resolving-conflicts && rm -rf skills-srcUse ~/.copilot/skills/ instead of .github/skills for a personal install. Commit .github/skills so cloud agent and code review can use it.
GitHub Copilot skills documentation · loads skills from .github/skills/, .claude/skills/, .agents/skills/
Install the "resolving-conflicts" agent skill from https://github.com/dotnet/dotnet-docker/tree/main/.agents/skills/resolving-conflicts into .github/skills/resolving-conflicts/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "resolving-conflicts", then confirm the skill loads.GitHub Copilot copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ npx skills add dotnet/dotnet-docker --skill resolving-conflicts -a opencodeOpenCode documents no install command of its own. Project install goes to .agents/skills/; add -g for ~/.config/opencode/skills/.
$ gh skill install dotnet/dotnet-docker resolving-conflicts --agent opencodeProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/dotnet/dotnet-docker.git skills-src && mkdir -p .opencode/skills && cp -r skills-src/.agents/skills/resolving-conflicts .opencode/skills/resolving-conflicts && rm -rf skills-srcUse ~/.config/opencode/skills/ instead of .opencode/skills for a personal install.
OpenCode skills documentation · loads skills from .opencode/skills/, .claude/skills/, .agents/skills/
Install the "resolving-conflicts" agent skill from https://github.com/dotnet/dotnet-docker/tree/main/.agents/skills/resolving-conflicts into .opencode/skills/resolving-conflicts/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "resolving-conflicts", then confirm the skill loads.OpenCode copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
Facts
- Skill name
resolving-conflicts- GitHub stars
- 4.9k
- Token cost
- ~573 tokens
- SKILL.md length
- 285 words
- Files
- 1
- Skills in repo
- 5
- Repo updated
- First seen
- Licence
- MIT
At a glance
A skill your agent uses when merging or cherry-picking changes cause git conflicts.
- Works in 3 steps: Name the source and target branches.… → Remember that ours and theirs depend on… → Resolve authored inputs first, then…
- Cherry-picking changes cause git conflicts
- Calls git
- Tasks that involve Containers
What it does
Resolving Conflicts is an agent skill from dotnet/dotnet-docker, published by the product's own GitHub organization. Use when merging or cherry-picking changes cause git conflicts.
Its SKILL.md is about 570 tokens, which your agent loads only when the skill is triggered. It is a single SKILL.md file with no bundled scripts.
It sits in DevOps & Cloud, covering Containers. It works with Git. The repository describes itself as: Official container images for .NET. The licence is MIT.
When your agent uses it
- Cherry-picking changes cause git conflicts
- Tasks that involve Containers
Example prompts
- “/resolving-conflicts”
Workflow steps
3 steps, taken from the first numbered list in SKILL.md.
- Name the source and target branches. Read the branch guide before choosing either side.
- Remember that ours and theirs depend on the Git operation. Inspect the stages with git ls-files -u; never resolve a file based only on…
- Resolve authored inputs first, then regenerate derived files.
What it can do on your machine
Read from SKILL.md and the folder at commit 3eaedc9. It shows what the files ask for, not the result of running them.
Tool permissions
Pre-approves nothing: there is no allowed-tools line, so your agent's usual permission prompts apply.
From allowed-tools in the SKILL.md frontmatter.
Runs code
Shell commands in SKILL.md call:
git
From the folder's file list and the shell code blocks in SKILL.md.
Network
No URLs in SKILL.md. Its commands use git, which can reach the network depending on how they are called.
From URLs in SKILL.md, links to its own repository left out.
Credentials
Names no API keys, tokens, secrets or passwords.
From names ending in _API_KEY, _TOKEN, _SECRET, _KEY or _PASSWORD in SKILL.md.
Context cost
Resolving Conflicts loads about 573 tokens when it runs. Until then it costs about 21 tokens; SKILL.md has 285 words of instructions outside code blocks.
Estimates: characters ÷ 4, the usual rule of thumb; real counts depend on the model's tokenizer. Scripts and assets cost tokens only if the agent reads them.
Safety
Auto-check passed
The automated check found no risky patterns in SKILL.md.
Automated static check — not a guarantee. Review scripts before installing. It scans the text of SKILL.md for risky patterns (piping downloads into a shell, reading credential files, hidden Unicode, destructive commands); files beside SKILL.md are not scanned.
SKILL.md
The full file from dotnet/dotnet-docker at commit 3eaedc9, republished under its MIT licence (© dotnet). 285 words, ~573 tokens.
Download SKILL.mdSave it as
.claude/skills/resolving-conflicts/SKILL.md (or your agent's skills folder).- name
- resolving-conflicts
- description
- Use when merging or cherry-picking changes cause git conflicts.
Resolving branch conflicts
- Name the source and target branches. Read the branch guide before choosing either side.
- Remember that
oursandtheirsdepend on the Git operation. Inspect the stages withgit ls-files -u; never resolve a file based only on those labels. - Resolve authored inputs first, then regenerate derived files.
| Conflict | Resolution |
|---|---|
manifest.versions.json | Start with the target's branch and product versions. Apply only the source component/version keys required by the port. "Newest" is not a rule: nightly daily builds and release servicing builds have different intent. |
manifest.json | Combine structural image changes, but preserve the target's image set, repositories, latest ownership, floating tags, and preview suffixes. |
eng/dockerfile-templates/** | Keep shared build logic from both changes. Retain a difference only when the target builds a different product or OS matrix. |
src/**/Dockerfile | Do not hand-merge generated Dockerfiles. Resolve manifests and templates, then regenerate them. |
| README and portal docs | Resolve README templates and manifests, then regenerate. Preserve target-specific official or nightly links and tag listings. |
| Tests and baselines | Port shared behavior tests. Preserve the target product matrix and regenerate baselines after resolving source. |
| Pipelines and workflows | Combine shared logic; preserve target-specific triggers, branch names, feeds, service connections, staging, and publishing behavior. |
| Modify/delete conflicts | Decide whether the image or feature belongs on the target branch. Do not restore or delete it merely to clear the conflict. |
| Other authored files | Merge the behavior semantically. A clean conflict marker resolution is not proof that the result is correct. |
Always regenerate Dockerfiles and READMEs when templates change.
Review git diff --check, generated-file consistency, tags, versions, image sets, and branch references. Run targeted pre-build tests. If the intended target behavior is unclear, stop and record the unresolved decision instead of guessing.
© dotnet, MIT. Rendered from Markdown: HTML in the file is shown as text, images as links, and headings moved down two levels. Raw file
Files
Just SKILL.md in .agents/skills/resolving-conflicts of dotnet/dotnet-docker.
Open the folder on GitHubat commit 3eaedc9
Compare with similar skills
Resolving Conflicts next to the 5 skills that share the most tags, products or categories with it. Stars are the repository's; “used in” counts other GitHub owners with a copy.
| Skill | Stars | Used in | Tokens | Auto-check | Licence | Repo updated |
|---|---|---|---|---|---|---|
| Resolving Conflicts this skilldotnet/dotnet-docker | 4.9k | — | ~573 | Automated safety check: Pass | MIT | |
| Rtk Skillsopaco/deepwiki-rs | 3.1k | — | ~1.4k | Automated safety check: Pass | MIT | |
| Releasear-io/ar-io-node | 127 | — | ~4.2k | Automated safety check: Notes | AGPL-3.0 | |
| Release Docs UpdateAMD-AGI/Primus | 130 | — | ~2.9k | Automated safety check: Pass | Custom licence | |
| Vibe CI Supply Chainmistralai/mistral-vibe | 5.1k | — | ~1k | Automated safety check: Pass | Apache-2.0 | |
| Medusa Cloud Local Buildmedusajs/medusa-agent-skills | 225 | — | ~1k | Automated safety check: Notes | None |
Similar skills
Release
ar-io/ar-io-node
Drive the AR.IO Node release process end-to-end — preflight checks, prepare commit, finalize with image SHAs, test docker compose profiles, tag & publish, and post-release cleanup.
Release Docs Update
AMD-AGI/Primus
Update the Primus documentation for a monthly training-image release — bump version references, realign the bare-metal install scripts with the release Dockerfiles, record the published image stacks…
- Official
Vibe CI Supply Chain
mistralai/mistral-vibe
Git workflow, CI/GitHub Actions, and supply-chain pinning rules for Mistral Vibe.
Medusa Cloud Local Build
medusajs/medusa-agent-skills
Reproduces a Medusa Cloud build on your machine with mcloud local build, to debug build-failed deployments without pushing or waiting on Cloud.
Ssh Skill
badseal/ssh-skill
A skill your agent uses when a task requires SSH or SCP/SFTP behavior, a remote server, server alias/IP/hostname/user@host, bastion or jump-host access, remote command execution, upload/download…
More from dotnet/dotnet-docker
- Official
Dockerfile And Readme Templating
dotnet/dotnet-docker
Modify Cottle templates that generate Dockerfiles and READMEs in dotnet/dotnet-docker.
- Official
Porting Changes
dotnet/dotnet-docker
Plan and move changes between branches in dotnet/dotnet-docker.
- Official
Image Management
dotnet/dotnet-docker
Manages .NET Docker images including adding images for new .NET versions, new Linux distros (Alpine, Ubuntu, Azure Linux), and new Windows versions.
- Official
Merge Main To Nightly
dotnet/dotnet-docker
Create a PR to merge main into the nightly branch after a .NET containers release.
Related
Works with
Categories
Questions about Resolving Conflicts
What does Resolving Conflicts do?
A skill your agent uses when merging or cherry-picking changes cause git conflicts. Resolving Conflicts is an agent skill from dotnet/dotnet-docker, published by the product's own GitHub organization. Use when merging or cherry-picking changes cause git conflicts.
When should I use Resolving Conflicts?
Resolving Conflicts fits situations like: cherry-picking changes cause git conflicts; tasks that involve Containers.
How do I install Resolving Conflicts in Claude Code?
Run `npx skills add dotnet/dotnet-docker --skill resolving-conflicts -a claude-code`. Or copy the skill folder (.agents/skills/resolving-conflicts in dotnet/dotnet-docker) into .claude/skills/resolving-conflicts in your project. Claude Code loads it when a task matches its description.
How do I install Resolving Conflicts in Codex?
Run `npx skills add dotnet/dotnet-docker --skill resolving-conflicts -a codex`. Or copy the skill folder (.agents/skills/resolving-conflicts in dotnet/dotnet-docker) into .agents/skills/resolving-conflicts in your project. Codex loads it when a task matches its description.
Can I use Resolving Conflicts in Cursor, Gemini CLI or GitHub Copilot?
Cursor, Gemini CLI, GitHub Copilot and OpenCode also load SKILL.md folders. With the skills CLI, run `npx skills add dotnet/dotnet-docker --skill resolving-conflicts -a cursor` (or -a gemini-cli, github-copilot or opencode for the others). To copy it by hand, put the folder in .cursor/skills/resolving-conflicts, .gemini/skills/resolving-conflicts, .github/skills/resolving-conflicts and .opencode/skills/resolving-conflicts in your project.
What does Resolving Conflicts need to run?
Going by SKILL.md and its folder, Resolving Conflicts needs the command-line tools its instructions call (git).
Does Resolving Conflicts access the network?
SKILL.md contains no URLs. Its commands use git, which can reach the network depending on how they are called. This is read from the text; nothing was executed.
Is Resolving Conflicts safe to install?
Our automated static check of SKILL.md found no risky patterns, such as piping downloads into a shell, reading credential files or hidden Unicode. It is not a guarantee. Review the folder before installing.
What licence does Resolving Conflicts use?
Resolving Conflicts is published under the MIT licence (the repository's licence). It allows redistribution, so the full SKILL.md is shown on this page.
How many tokens does Resolving Conflicts use?
About 573 tokens (SKILL.md is roughly 2.3k characters). Agents keep only the skill's name and description in context until a task matches; then they load SKILL.md in full.
What are the alternatives to Resolving Conflicts?
Skills that share tags, products or a category with Resolving Conflicts: Rtk Skill (sopaco/deepwiki-rs, 3.1k stars), Release (ar-io/ar-io-node, 127 stars), Release Docs Update (AMD-AGI/Primus, 130 stars) and Vibe CI Supply Chain (mistralai/mistral-vibe, 5.1k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.
Who maintains Resolving Conflicts?
dotnet (a GitHub organization, an official publisher) maintains it in dotnet/dotnet-docker, which has 4,874 GitHub stars. The repository holds 5 skills in this directory. The repository was last updated on October 7, 2026.
Source: dotnet/dotnet-docker on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.