Resolve Merge Conflicts
github/gh-aw/.github/skills/resolve-merge-conflicts
devopsResmi
Resmi Sağlayıcı Skill'iView repo
Merge a base ref and safely regenerate compiled workflow lock-file conflicts.
Dosyalar2 dosya
SKILL.md74 satır
Loading editor…
Kurulum
ÖnerilenTek komut — ajanınız otomatik olarak devreye alır.
Kurulum komutunu görmek için yukarıdan bir AI aracı seçin.
veya
Manuel Kurulum
Daha fazla adımArşivi indirin ve dosyaları projenize manuel olarak ekleyin.
Skill detayları
Versiyonv1.0.0
YazarGitHub
Kategoridevops
Skill IDgithub/gh-aw/.github/skills/resolve-merge-conflicts
Dosyalar2 dosya
İlgili skill'ler
Agent CollaborationStandard collaboration patterns for all squad agents — worktree awareness, decisions, cross-agent communicationAgent ConductShared hard rules enforced across all squad agentsAgentic 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 writtenAwf 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.