Resolve merge conflicts in generated workflow lock files by rebuilding them from merged Markdown sources. The skill checks for leftover conflict markers, stages regenerated files, and verifies that unresolved paths and whitespace errors are cleared.
Merge a base ref and safely regenerate compiled workflow lock-file conflicts.
Review the instructions the agent will receive before you install.
Use this skill when merging origin/main into a branch, especially when the
only conflicts are generated .github/workflows/*.lock.yml files.
From the repository root, run:
./.github/skills/resolve-merge-conflicts/resolve.sh origin/main
The command works both before a merge and after another command has stopped on conflicts. It:
--no-commit, or resumes the current merge..lock.yml..github/workflows/*.md for leftover conflict-marker lines
(<<<<<<<, |||||||, =======, >>>>>>>) and aborts before compiling
if any are found — see "Why the marker scan matters" below.make recompile once so generated files come from the merged Markdown.The script does not fetch, commit, push, abort, or edit workflow Markdown.
Refresh origin/main first only when credentials are available. After success,
review the staged merge, run the repository's final validation gate, then
commit and push.
A source .md conflict resolved manually (by a human or an agent) can leave
a stray conflict-marker line behind — most often the rarely-noticed
||||||| base (original) diff3 marker — inside a workflow's YAML
frontmatter. git diff --check only inspects lines touched by the current
diff/staged hunks, so a marker already committed in otherwise-unchanged file
content passes silently. The gh-aw compiler then parses the marker text as a
literal YAML header option (e.g. invalid header option: "|||||| base (original)"), which fails compilation later — often in an unrelated
scheduled recompilation run, far from the original merge, making the root
cause hard to trace back.
Run the standalone check any time you suspect a workflow .md file went
through manual conflict resolution, even outside this script's merge flow:
./.github/skills/resolve-merge-conflicts/resolve.sh --verify-markers
It exits non-zero and lists the offending file(s)/line(s) if any marker is found, and does not modify the working tree.
ours or theirs for compiled lock files; regenerate them..lock.yml files..md, Go, JavaScript, or other mixed conflict.No reviews yet. Tell others what you thought.
No login needed. Share how it worked for you, ask a question, or note where it did not run.
No comments yet. Be the first to write one.
Coordinate work across AI agents with shared rules for locating team files, recording decisions and their reasons, and requesting help. It also defines who owns revisions after a reviewer rejects an artifact.
Set shared development rules for an agent team: keep specific agent names out of product code, tests, and CI configuration, verify affected tests before finishing, and record lessons learned from mistakes.
Routes requests to design, create, update, debug, or upgrade GitHub Agentic Workflows to the appropriate instructions. It helps the agent select a workflow-specific procedure and apply any additional rules defined for the repository.
Prepare architecture proposals before implementation so the team can agree on a direction. Organize evidence, technical choices, effects on existing work, risks, and the first release’s scope into a document with clear recommendations and decision owners.
Update the gh-aw-firewall version used by gh-aw, rebuild generated files, and review release notes and configuration schemas, which define valid settings. It guides related code and test updates while identifying follow-up work that remains.
Review git and gh operations in gh-aw workflows to check credential availability for each repository. Identify missing token handoffs, risky expansions of limited checkouts, and error handling needed where credentials are intentionally unavailable.