Resolve git branch conflicts by behavioral intent with user escalation.
npx skills add https://github.com/FuZhiyu/superRA --skill semantic-merge
Please help me install this Agent Skill. Skill: semantic-merge Source: https://github.com/FuZhiyu/superRA/tree/main/skills/semantic-merge Command: npx skills add https://github.com/FuZhiyu/superRA --skill semantic-merge
This Skill prevents semantic regressions during merges, rebases, cherry-picks, and branch synchronization by resolving conflicts according to the intended behavior and preserving a documented integration trail.
Ask the semantic-merge skill to integrate the incoming branch into the current branch and report any intent-changing decisions that require approval.
High-intent search queries and answers about installing and using this skill.
Semantic merge resolves git merge conflicts by investigating both branches, classifying overlapping changes, and synthesizing compatible behavior rather than mechanically choosing conflict sides. It preserves valid changes across code, data, tests, documentation, and configuration.
Semantic merge is an intent-based integration technique for branch synchronization that prevents semantic regressions during merges, rebases, and cherry-picks. You need it when overlapping changes affect data contracts, test expectations, or generated outputs.
During a rebase, stale references and data-contract changes are identified through repository-state inspection and intent classification. Semantic merge escalates conflicting schema decisions requiring user approval, regenerates affected outputs, and verifies stale references are removed.
Yes, semantic merge supports orchestrated workflow synchronization with task-local sync records, reviewer verification, and semantic coherence checks. It handles branch synchronization across code, data, tests, documentation, configuration, and generated outputs.
The best way to prevent semantic regressions is intent-based integration that inspects both branches, escalates conflicting schema decisions, regenerates affected outputs, and runs protection-test verification. This preserves valid changes instead of mechanically resolving line-level overlap.
Git cherry-pick creates semantic regressions when line-level overlap obscures behavioral intent changes. Avoid them by classifying overlapping changes, verifying stale references, checking protection tests, and escalating data-contract or test expectation shifts for user approval.
supermalangRead visual approval states for changed baseline images without modifying repository files.
GregorStocksValidate the full diff and checks, then open a pull request for the current branch.
fartyboboRun githooks, linters, tests, and branch safety checks before committing.
KentoShimizuResolve Git merge and rebase conflicts with per-hunk intent logs.
