Resolve Merge Conflicts

github/gh-aw/.github/skills/resolve-merge-conflicts

Multi-file

GitHub· v1.0.0

devopsOfficial

Official Provider SkillView repo

Merge a base ref and safely regenerate compiled workflow lock-file conflicts.

Files2 files

SKILL.md74 lines

Loading editor…

Install

Recommended

One command — your agent picks it up automatically.

Select AI agent

Select an AI agent above to see the install command.

or

Manual Install

More steps

Download the archive and add the files to your project manually.

Skill details

Versionv1.0.0

AuthorGitHub

Categorydevops

Skill IDgithub/gh-aw/.github/skills/resolve-merge-conflicts

Files2 files

Related skills

Agent CollaborationStandard collaboration patterns for all squad agents — worktree awareness, decisions, cross-agent communication Agent ConductShared hard rules enforced across all squad agents Agentic WorkflowsRoute gh-aw workflow design/create/debug/upgrade requests to the right prompts.Architectural ProposalsHow to write comprehensive architectural proposals that drive alignment before code is written Awf Release IntegratorUpgrade gh-aw to latest gh-aw-firewall release and identify follow-up spec tasks.Checkout Credential ReviewReview code that performs git or gh operations against repository checkouts in gh-aw, checking that the right credentials are available at the right time and that sparseness, shallowness and credential-free factors are properly considered.