Resolving Conflicts

Use when merging or cherry-picking changes cause git conflicts.

.NET (Microsoft) Updated 22.1k repo stars

File contents

dotnet/dotnet-docker commit d778ada11a

Frequently asked questions

npx get-skill add dotnet/resolving-conflicts