merging-concurrent-branches

wdm0006/python-skills

Resolve conflicts when several branches are open against one repo at once - the hotspot files every change touches, additive registries unioned instead of chosen, version counters recomputed from the integration branch, generated artifacts rebuilt rather than merged, deterministic serialization so diffs stay reviewable, shared identifiers appended and never renumbered, and re-running the real gate because a clean auto-merge is not a passing test

GitHub stars

108

Sponsors

SnugThe clipboard manager you and your agent can use, safelyAgent CaffeineClose your lid, come back to finished workWaxBlock anything with supervision, without erasing your iPhoneOpen StepsSponsoredFree and open-source skills that make AI coding agents easier to understand, verify, and control.