From 56b191b406fa42e977254b56a23cb9df040acd64 Mon Sep 17 00:00:00 2001 From: Meta Vens Date: Thu, 17 Sep 2026 20:18:37 +0200 Subject: [PATCH] Fix Cut 3 note: unreleased asset-guid branch, real conflict shape, rebased line ref Soul (F9) flagged three drifted claims in Cut 3, from 8c0e726: codex/asset-guid-attribute is pushed but not merged to main, so it has not "landed and released" - it releases first, this cut after. A plain merge of two branches that each rebuilt the same tracked plugin DLLs/pdbs does not "silently drop" one side; git reports binary conflicts on them, resolved by rebuilding rather than hand-merging binary blobs. And the build script's meshPackageVersion check line reference was stale for the post-rebase state: 0c9cb57 (on codex/asset-guid-attribute, not yet on this branch) inserted two lines above it for the OpenSSL notice, moving the check from :150-153 to :152-155 once this cut rebases onto that branch. Co-Authored-By: Claude Opus 5 --- docs/studio-grouping-cut.md | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/docs/studio-grouping-cut.md b/docs/studio-grouping-cut.md index 8be80722..950289c0 100644 --- a/docs/studio-grouping-cut.md +++ b/docs/studio-grouping-cut.md @@ -560,11 +560,13 @@ hits only a KDTree file). Versions bumped from the original 1.0.60/1.4.0 plan: `codex/asset-guid-attribute` took 1.0.60/1.4.0 for its own release (replacing the asset path attribute with -`CultInspectorAssetGuid`, then adding sub-asset key support), landed and -released first. This branch must rebase onto and rebuild after -`codex/asset-guid-attribute` before its own release: same files -(`CultInspectorModel.cs`, the Studio drawers, the plugin DLLs/pdbs), so a plain -merge would silently drop one side's binary rebuild. +`CultInspectorAssetGuid`, then adding sub-asset key support, then a built-in +refusal fix and a stale-value Clear button); it releases first. This branch +must rebase onto and rebuild after `codex/asset-guid-attribute` before its own +release: same files (`CultInspectorModel.cs`, the Studio drawers, the plugin +DLLs/pdbs), so a plain merge reports binary conflicts on the plugin DLLs/pdbs +rather than silently picking one side; resolve by taking either side's text +changes as needed and then rebuilding, not by hand-merging the binaries. - **Repo and branch:** CultLib `main`. Merge `claude/studio-grouping` (fast-forward or merge commit), then create the release commit in the same @@ -577,7 +579,9 @@ merge would silently drop one side's binary rebuild. `x86_64/*.dll`, via `powershell -File scripts\build-unity-package.ps1 -UpdateTemplate`. The script derives the assembly version from the package.json and checks it - (`:150-153`). + (`:152-155` after the rebase onto `codex/asset-guid-attribute`, whose + `0c9cb57` inserted two lines above this block for the OpenSSL notice; + it is `:150-153` on this branch's own unrebased copy of the script). - **Tags on the release commit:** `cultlib-unity-v1.0.61` and `caching-unity-v1.5.0`. That is two tags in one push, under GitHub's three-tag workflow limit (migration cut map header). No `cultmath-unity` tag,