ci: synchronize main lineage into dev before the downloads release - #171
Merged
Conversation
release: promote Theorvane studio landing
* feat: rename OpenVideo to OpenScene and move the site to openscene.app (#160) * feat: rename OpenVideo to OpenScene and move the site to openscene.app Renames the product across the monorepo and makes `openscene.app` its canonical origin. `apps/openvideo` becomes `apps/openscene` and the workspace package becomes `@theorvane/openscene-site`. The canonical origin, sitemap, robots directives, OpenGraph metadata, and the Theorvane home product link all move to `https://openscene.app`. The wordmark is authored as `OPEN<span>VIDEO</span>`, so the header, footer, docs shell, and generated OG image each needed the split markup updated rather than a plain string replacement. `open-video.app` and `www.open-video.app` join `openvideo.theorvane.tech` as legacy hosts that permanently redirect to the canonical origin, so the search signals accumulated under the previous canonical domain transfer instead of splitting across hosts. Every former hostname must stay attached to the Vercel project for those redirects to be reached. The legacy hostname `openvideo.theorvane.tech` keeps its name because renaming it would break the redirect it exists to serve. Copy describing what the editor does — "video editor", "video generation" — is unchanged, since it names the function rather than the product. Sitemap `lastModified` moves to 2026-07-31 for OpenScene and Theorvane, the two sites whose published content changed. Closes #159 Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> * fix: point OpenScene at its own RybbIt site and correct Korean particles The move to `openscene.app` created a distinct RybbIt site, so the tracking script now carries `c2c0972a916f` instead of the site ID registered under the previous domain. The task brief records the supersession rather than leaving a stale ID that reads as current. Renaming OpenVideo to OpenScene also broke the Korean particles that followed it. The former name ended in a vowel and took 는/를/가/란; the new one ends in a consonant and takes 은/을/이/이란. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5 <noreply@anthropic.com> * chore: remove leftover conflict files and patch artifacts (#163) --------- Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
Release PR #165 was squash merged into `main` as 9a45159. A squash merge discards the parent relationship, so `main` and `dev` shared no ancestry for that work even though their content matched, and git read the same changes as independent edits on both sides. Release PR #169 reported CONFLICTING as a result. This is a graph repair, not a content change. Every conflict resolves to the `dev` side because `main` holds nothing `dev` lacks — it received the content from `dev` through the squash. The rename/rename conflicts on `logo.svg` and the product mark are the same story: each side renamed the pre-rename file to a different destination, and both destinations exist on `dev` already. The resulting tree is identical to origin/dev. Closes #170 Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
sjungwon03
added
type: ci
|
The latest updates on your projects. Learn more about Vercel for GitHub. 2 Skipped Deployments
|
sjungwon03-ai
approved these changes
Jul 31, 2026
sjungwon03-ai
left a comment
sjungwon03-ai
left a comment
Member
There was a problem hiding this comment.
This PR is a graph repair to restore proper ancestry between main and dev after squash merges (no file changes, tree identical to dev). CI is green (skipped as unaffected), mergeable state is clean, and there are no code-quality issues.
Approved.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #170
Why
Release PR #165 was squash merged into
mainas9a45159. A squash merge discards the parent relationship, somainanddevshared no ancestry for that work even though their content matched. Git therefore read the same changes as independent edits on both sides, and release PR #169 reportedCONFLICTING/DIRTY.This follows the repair already used by #132, #139, and #157.
What this is
A graph repair with no content change.
02ce8bcdev2913694main9a45159devside, becausemainholds nothingdevlacks — it received the content fromdevthrough the squash.apps/openvideo/public/logo.svgandapps/theorvane/public/products/openvideo.svgare the same story: each side renamed the pre-rename file to a different destination, and both destinations already exist ondev.Proof it is content-neutral
git diff origin/dev HEADis empty — the candidate tree is identical to the currentdevtree.git merge-base --is-ancestor origin/dev HEAD✅git merge-base --is-ancestor origin/main HEAD✅Verification
npm run lint,npm run typecheck,npm test,npm run build,npm audit --omit=dev --audit-level=high(0 vulnerabilities),git diff --check origin/dev...HEAD, andgit diff --check origin/main...HEADall pass.🤖 Generated with Claude Code