Browse Source
The TEST-s branch carried a patch-equivalent Popi.TV login commit that conflicts with newer API routing files when merged normally. This merge records TEST-s as a parent while keeping the already verified master tree unchanged, so the test branch can fast-forward without a force push.
Constraint: Do not force-push TEST-s or hand-resolve unrelated API route conflicts for a text-node rollout.
Rejected: Force push HEAD to TEST-s | would drop the remote branch commit from visible history.
Rejected: Manual content merge | conflicts are outside this text document node change and the remote patch is already represented locally.
Confidence: medium
Scope-risk: narrow
Directive: Revisit TEST-s ancestry before future long-lived branch syncs; avoid carrying duplicate patch-equivalent commits across master and TEST-s.
Tested: git diff --stat 7281d4f..HEAD is empty
Tested: prior text node verification on 7281d4f: vitest target suite, next build, git diff --check
Not-tested: Full test suite after ancestry-only merge, because the tree is identical to 7281d4f.
TEST-s
jiajia
1 month ago