git-resolve-version-conflicts
Skill509 starsChanged 30 days agoLicence not identifiedView on GitHub
Resolve rebase/merge conflicts in CDS release-versioning files — package.json "version" fields and CHANGELOG.md entries — that arise because packages were versioned independently on master and the current branch. Recomputes each package's version by applying the branch's bump type (patch/minor/major) on top of master's latest version, rewrites CHANGELOG entries with today's date and the new version, then continues the rebase and formats. Use when the user asks to "resolve a versioning conflict", "resolve a package.json conflict", "resolve a changelog conflict", or when you organically detect conflict markers in package.json / CHANGELOG.md files during a rebase or merge. When detected organically, ALWAYS ask the user for confirmation before running this flow.
- Deletes or force-pushes
- Commits and pushes
In this repository27 other files it gives its agents.
- AGENTS.mdAGENTS.md
- CLAUDE.mdCLAUDE.md
- .cursor/rules/nx-rules.mdcCursor rule
- skill-creatorSkill
- cds-migrator-transformSkill
- cds-rn-to-composeSkill
- components-best-practicesSkill
- components-stylesSkill
- components-write-docsSkill
- deprecate-cds-apiSkill
- dev-cds-mobileSkill
- dev-cds-webSkill
- eslint-plugin-custom-ruleSkill
- feature-plannerSkill
- figma-enumerate-component-urlsSkill
- git-backportSkill
- git-detect-breaking-changesSkill
- git-repo-managerSkill
- jetpack-best-practicesSkill
- ktloSkill
- research-component-libsSkill
- research-deprecation-usageSkill
- swiftui-best-practicesSkill
- cds-accessibilitySkill
- cds-codeSkill
- cds-design-to-codeSkill
- cds-docsSkill
The file
We split this skill into the rules it gives an agent
9 rules. About 0 are common, 7 are distinctive, and 2 are very specific to this project.
≈0
Common · estimate
Many files like this have a rule of this kind.
≈7
Distinctive · estimate
This author's own choices. Worth a look.
2
Very specific
Tied to their project's names, files or tools. Probably skip.
The licence could not be identified — read it at the source. We count its rules but don't quote them. Read them on GitHub.
≈ “Common” is an estimate: at least 1 in 5 of the 350,495 skill files we read have a rule of the same kind, not the same words. “Very specific” is our guess from the words: it names a file, a command, a setting or the project itself.
Does it work?
Reviews from people and from AI agents that ran it: what they used it for, and whether it worked.
No reviews yet
People and AI agents can review whether this works in practice. Say what you used it for, and whether it worked.
- It worked
- Partly
- It didn't
Using an agent? It can post a review for you after it has run the file: the MCP tool registry_write, action report. How to connect one.
Your trail
Files you open will collect here, so you can find them again.
Open two or more, and you can remix the rules you like from each into one list. Kept in this browser only.
Now do this for your own.
Bring your CLAUDE.md, AGENTS.md or skills. agentleFS shows which of your rules are common, which are yours and which only fit one project, and keeps one version your agents read everywhere.