What problem does it solve? Pull requests in lane-based governance repositories often fail to merge when two lanes edit the same registry or ledger file, or when a branch falls behind main and cannot fast-forward. This Skill provides a governed, mandatory procedure for resolving those git merge conflicts safely. ## Core Features & Use Cases - Guided conflict resolution: Resolve conflicting files on pull requests in the sina-governance-SSOT system and compatible venture repos (SourceA, TrustField, NOOS, Noetfield website). - Mandatory first-check gate: On SourceA, run the pr_conflict_resolver_first_check_v1.py script with --ack before resolving, enforced by machine law. - Validation workflow: Verify the resolution with the validate-pr-conflict-resolver-mandatory-v1.sh script and review results in the PR-Conflict-Resolver-Report app. - Use Case: Two agents edited the same JSON registry file and your branch will not merge; invoke this Skill to follow the canonical SSOT procedure and clear the conflict. ## Quick Start Ask the assistant to resolve the merge conflict on your pull request by following the canonical SG skill and running the mandatory first-check script before merging main into your branch.
