Resolve Merge Conflicts Agent Skill
Merge a base ref and safely regenerate compiled workflow lock-file conflicts.
Install
one command, takes just this skill from the repositorynpx skills add https://github.com/github/gh-aw --skill resolve-merge-conflictsWhat comes with it
2 799 bytes besides the instructionThe instruction itself
3 sections, as written by the authorResolve 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:
./.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:
- Starts the merge with
--no-commit, or resumes the current merge. - Refuses to auto-resolve if any conflict is not a workflow
.lock.yml. - Runs
make recompileonce so generated files come from the merged Markdown. - Stages the regenerated conflicting lock files.
- 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.
Safety rules
- Never choose
oursortheirsfor compiled lock files; regenerate them. - Never manually remove conflict markers from
.lock.ymlfiles. - Never auto-resolve a source
.md, Go, JavaScript, or other mixed conflict. - If the script refuses a mixed conflict, resolve source conflicts on their
merits, stage them, and rerun the same command. It will regenerate the
remaining lock conflicts.
- Do not abort an existing merge unless the user explicitly requests it.
Other skills for the same job
different authors, same section of the catalogue
Use when you have a written implementation plan to execute in a separate session with review checkpoints
Integration with protocols.io API for managing scientific protocols. This skill should be used when working with protocols.io to search, create, update, or publish protocols; manage protocol steps and materials; handle discussions and comments; organize workspaces; upload and manage files; or integrate protocols.io functionality into workflows. Applicable for protocol discovery, collaborative protocol development, experiment tracking, lab protocol management, and scientific documentation.
Analyzes job descriptions and generates tailored resumes that highlight relevant experience, skills, and achievements to maximize interview chances
Build and distribute Expo development clients locally or via TestFlight
Data structure for annotated matrices in single-cell analysis. Use when working with .h5ad files or integrating with the scverse ecosystem. This is the data format skill—for analysis workflows use scanpy; for probabilistic models use scvi-tools; for population-scale queries use cellxgene-census.
Benchling R&D platform integration. Access registry (DNA, proteins), inventory, ELN entries, workflows via API, build Benchling Apps, query Data Warehouse, for lab data management automation.
Comprehensive molecular biology toolkit. Use for sequence manipulation, file parsing (FASTA/GenBank/PDB), phylogenetics, and programmatic NCBI/PubMed access (Bio.Entrez). Best for batch processing, custom bioinformatics pipelines, BLAST automation. For quick lookups use gget; for multi-service integration use bioservices.
Query the CELLxGENE Census (61M+ cells) programmatically. Use when you need expression data across tissues, diseases, or cell types from the largest curated single-cell atlas. Best for population-scale queries, reference atlas comparisons. For analyzing your own data use scanpy or scvi-tools.
How to use it
Take github/resolve-merge-conflicts from the repository into ~/.claude/skills for personal
use, or into .claude/skills inside a project.
The agent identifies a skill by the name field in its header. Two skills with the
same name cannot sit side by side — one of them will be ignored.