Resolving Conflicts
dotnet/dotnet-docker/.agents/skills/resolving-conflicts
codingOfficial
Official Provider SkillView repo
Use when merging or cherry-picking changes cause git conflicts.
Files1 files
SKILL.md27 lines
Loading editor…
Install
RecommendedOne command — your agent picks it up automatically.
Select an AI agent above to see the install command.
or
Manual Install
More stepsDownload the file and paste it into your agent's system prompt.
Skill details
Versionv1.0.0
Author.NET
Categorycoding
Skill IDdotnet/dotnet-docker/.agents/skills/resolving-conflicts
Related skills
Dockerfile And Readme TemplatingModify Cottle templates that generate Dockerfiles and READMEs in dotnet/dotnet-docker.Image ManagementManages .NET Docker images including adding images for new .NET versions, new Linux distros (Alpine, Ubuntu, Azure Linux), and new Windows versions. Handles Dockerfile templates, manifest updates, test data, and README generation.Merge Main To NightlyCreate a PR to merge main into the nightly branch after a .NET containers release. Use only when specifically asked to "merge main to nightly".Porting ChangesPlan and move changes between branches in dotnet/dotnet-docker. Use when asked to port or backport changes.Api ReviewAuthor and file a separate ASP.NET Core API review issue from an originating issue and an implementation pull request or commits. USE FOR writing API review issues, preparing api-ready-for-review proposals, filling API proposal templates, creating API review descriptions from issues and code changes, "fill out the API review", "prepare API review", or opening a pull request that changes public API. DO NOT USE FOR reviewing API design decisions, approving APIs, implementing APIs, or general code Review Public ApiReview a proposed public API for the dotnet/aspnetcore repo the way the @dotnet/aspnet-api-review team would, and recommend concrete changes to the API shape. USE FOR reviewing an API proposal or api-ready-for-review issue, critiquing a ref-assembly diff, deciding whether a new or changed type/method/overload/property should be added at all, evaluating whether an API change or addition is a good idea, changing/extending an existing API or a shipped default/convention, or checking naming/namespac