SkillOfficial
resolve-merge-conflicts
MITUpdated on Nov 11, 20265,616GitHub starsIncludes scripts
A gh-aw maintainer skill for merging the main branch into a working branch.
What the skill teaches
A gh-aw maintainer skill for merging the main branch into a working branch. Its bundled shell script handles the common case where the only conflicts are in the generated workflow lock files: it merges, regenerates those files instead of hand-editing them and stops if any other file conflicts. The script works whether the merge has started or not. It depends on gh-aw's workflow compiler.
Capabilities
- Merge the main branch into a working branch
- Regenerate conflicting workflow lock files
- Stop on conflicts that need manual resolution
Install
The project doesn't document install steps that we could confirm. See the project's own instructions
What's inside
- resolve.sh
Details
| Fact | Value | Source |
|---|---|---|
| Type | Skill | |
| Tool | GitHub | |
| Publisher | GitHub | source |
| Official status | Officialin GitHub's own GitHub organisation (github/gh-aw, GitHub Agentic Workflows) | source |
| Needs an API key or sign-in | Not stated in its documentation | |
| Includes scripts | Yes | source |
| Platforms | Not stated in its documentation | |
| AI clients | Not stated in its documentation | |
| Licence | MIT | source |
| Pricing | Not stated in its documentation | |
| Activity | Last commit Nov 11, 20265,616 GitHub starsDownload data not available (not on npm or PyPI) | source |
| Links | Repository Website |
Sources
- Skill file (SKILL.md)github.com/github/gh-aw · Backs: Official status, Publisher, Includes scriptsNov 10, 2026
- Licence file (LICENSE)github.com/github/gh-aw · Backs: LicenceNov 13, 2026
- GitHub repositorygithub.com/github/gh-aw · Backs: Activity, LicenceNov 11, 2026
- Folder in the repository (resolve-merge-conflicts)github.com/github/gh-aw · Backs: Includes scriptsNov 10, 2026