merge-discipline
Skill0 starsChanged 4 months agoMITView on GitHub
Use during any Hyperworkflows delivery merge phase - single-merger protocol, MERGE_TOKEN lifecycle, full-suite gating, and revert-and-quarantine rules.
1 other project uses a version of this.
Adopted by
Most recently taken up by
- FuDesign2008/open-skillstheir own version, first seen Nov 6, 2026
Other versions1 project uses a version of this.
Word for word · 0
None found.
Edited · 0
None found.
Wrote their own version · 1
- FuDesign2008/open-skills★ 6same name
How matches are found. Word for word: the exact same text. Edited: shares passages with this file (“99% same” means 99% of its five-word phrases also appear here; 10% or more counts). Their own version: similar meaning, or, weakest, the same name. We can’t tell which project had it first. Projects are counted among the 200 most-starred candidates, and mentions are links to the repository we found, up to 50 per site, so both counts are a floor.
In this repository4 other files it gives its agents.
- adjudication-protocolSkill
- oracle-forgingSkill
- spec-attackSkill
- tricolor-reportingSkill
The file
We split this skill into the rules it gives an agent
2 rules. About 0 are common, 1 is distinctive, and 1 is very specific to this project.
≈0
Common · estimate
Many files like this have a rule of this kind.
≈1
Distinctive · estimate
This author's own choices. Worth a look.
1
Very specific
Tied to their project's names, files or tools. Probably skip.
- Common
- Distinctive
- Very specific
- Very specific: line 11
Create runs/<run-id>/MERGE_TOKEN (the PreToolUse guard blocks merge/push without it while a run is active).
- Distinctive: line 13
Run the FULL suite — not the group's acceptance, the whole thing.
≈ “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.
Files
Merge Discipline
Parallel building, serial merging. One merger, one group at a time, every merge proven.
Protocol per group:
- Create
runs/<run-id>/MERGE_TOKEN(the PreToolUse guard blocks merge/push without it while a run is active). - Merge the tournament winner's branch into the integration branch.
- Run the FULL suite — not the group's acceptance, the whole thing. Record exit codes.
- Green → record verdict file with suite exit codes as probes; remove MERGE_TOKEN; next group.
- Red → revert the merge IMMEDIATELY; mark the group QUARANTINED with the failing exit codes; remove MERGE_TOKEN; continue with the next group. Never proceed on a red integration branch.
Rules:
- "The failure was pre-existing" requires proof: re-run the suite on the pre-merge commit and show it red there too. No evidence, no excuse.
- Mechanical conflicts (non-overlapping hunks) may be resolved and noted. Semantic conflicts are STUCK — report, never guess.
- Topological levels merge in order; groups within a level merge serially in group-id order (deterministic, resumable).
- A leftover MERGE_TOKEN after the phase is a bug — surface it, never silently delete it outside the protocol.
- Remote pushes only when the run's instructions explicitly authorize them.
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.