merge-discipline

Sterne0

Forks0

Aktualisiert4. Juli 2026 um 10:16

Use during any Hyperworkflows delivery merge phase - single-merger protocol, MERGE_TOKEN lifecycle, full-suite gating, and revert-and-quarantine rules.

Installation

Mit Codex oder Claude installieren Kopieren Sie diesen Prompt, fügen Sie ihn in Codex, Claude oder einen anderen Assistant ein und lassen Sie die Skill-Seite prüfen und installieren.

Quelle

aezizhu

aezizhu/hyperworkflows

GitHub-Repository öffnen Creator-Repositorys ansehen

Download

Verwandte BerufeSOC

Basierend auf der SOC-Berufsklassifikation

SoftwareentwicklerInformatik- und Mathematikberufe·SOC 15-1252

SKILL.md

readonly

name	merge-discipline
description	Use during any Hyperworkflows delivery merge phase - single-merger protocol, MERGE_TOKEN lifecycle, full-suite gating, and revert-and-quarantine rules.

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.

Mehr aus diesem Repository

gleiches Repository

tricolor-reporting

aezizhu/hyperworkflows

Use when rendering any Hyperworkflows result to a human - the mandatory report format with verified/unverified/quarantined+grey buckets, coverage arithmetic, and evidence links.

2026-07-040

adjudication-protocol

aezizhu/hyperworkflows

Use when a contested set needs rulings - court procedure (advocate/skeptic/risk-officer), evidence requirements, sequential fallback, and escalation rules.

2026-07-040

oracle-forging

aezizhu/hyperworkflows

Use when a unit of work has no executable acceptance (no test, no verifiable output) and you need to construct one - golden files, property tests, metamorphic relations, snapshot tests - or prove it infeasible.

2026-07-040

spec-attack

aezizhu/hyperworkflows

Use before building or auditing against acceptance contracts - systematically finds missing acceptance dimensions so "all green but wrong" cannot ship through contract holes.

2026-07-040

name	merge-discipline
description	Use during any Hyperworkflows delivery merge phase - single-merger protocol, MERGE_TOKEN lifecycle, full-suite gating, and revert-and-quarantine rules.

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.