resolve-merge-conflicts

# Resolve Merge Conflicts Use this skill when merging `origin/main` into a branch, especially when the only conflicts are generated `.github/workflows/*.lock.yml` files. ## One-step path From the repository root, run: ```bash ./.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: 1. Starts the merge with `--no-commit`, or resumes the current merge. 2. Refuses to auto-resolve if any conflict is not a workflow `.lock.yml`. 3. Scans `.github/workflows/*.md` for leftover conflict-marker lines (`<<<<<<<`, `|||||||`, `=======`, `>>>>>>>`) and aborts before compiling if any are found — see "Why the marker scan matters" below. 4. Runs `make recompile` once so generated files come from the merged Markdown. 5. Stages the regenerated conflicting lock files. 6. Verifies that no unresolved paths or whitespace errors remain. 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. ## Why the marker scan matters 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 ...