You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Release PR #165 was squash merged into main as 9a45159. A squash merge discards the parent relationship, so main and dev now share no ancestry for that work even though their content matches. Git therefore reads the same changes as independent edits on both sides, and the release PR #169 reports CONFLICTING / DIRTY.
Graph repair only, following the pattern established by #132, #139, and #157.
Branch release/<this issue>-sync-main-lineage from current origin/dev.
Merge origin/main into it as a merge commit, taking dev content on every conflict — main has no content dev lacks, because main received it from dev via the squash.
Prove the result is content-neutral: the candidate tree must equal the current origin/dev tree.
Acceptance criteria
git diff origin/dev <candidate> is empty.
Both origin/dev and origin/main are ancestors of the candidate.
npm run lint, npm run typecheck, npm test, npm run build, npm audit --omit=dev --audit-level=high, and git diff --check pass.
Problem
Release PR #165 was squash merged into
mainas9a45159. A squash merge discards the parent relationship, somainanddevnow share no ancestry for that work even though their content matches. Git therefore reads the same changes as independent edits on both sides, and the release PR #169 reportsCONFLICTING/DIRTY.Reported conflicts:
apps/openscene/app/page.tsxapps/openscene/lib/docs/content.en.tsapps/openscene/lib/docs/content.ko.tsapps/openvideo/public/logo.svgandapps/theorvane/public/products/openvideo.svg, which the rename in feat: rename OpenVideo to OpenScene and move the site to openscene.app #160 and the product-landing work resolved to different destinations on each sideScope
Graph repair only, following the pattern established by #132, #139, and #157.
release/<this issue>-sync-main-lineagefrom currentorigin/dev.origin/maininto it as a merge commit, takingdevcontent on every conflict —mainhas no contentdevlacks, becausemainreceived it fromdevvia the squash.origin/devtree.Acceptance criteria
git diff origin/dev <candidate>is empty.origin/devandorigin/mainare ancestors of the candidate.npm run lint,npm run typecheck,npm test,npm run build,npm audit --omit=dev --audit-level=high, andgit diff --checkpass.Non-goals
mainparent and leave the lineage unrepaired.