Skip to content

Restore the relationship lore graph work (revert of #24) - #25

Merged
mcfarhat merged 1 commit into
developfrom
fix/restore-relationship-lore-graph
Aug 11, 2026
Merged

mcfarhat merged 1 commit into
developfrom
fix/restore-relationship-lore-graph

Conversation

@mcfarhat

Copy link
Copy Markdown
Contributor

Reverts #24, restoring the #21 work that was merged at 19:02 and reverted at 20:52. This is correcting my mistake, not Kareem's.

What happened

Kareem merged #21 himself after I approved it. That was the wrong call — merging is the reviewer's — and he opened #24 to revert it, which was the right instinct. I verified that revert was exact and approved it, on the reasoning that it would return develop to its pre-merge state and clear the conflicts the out-of-order merge had created on #22 and #20.

It did the opposite. Reverting a merge commit leaves the branch's commits as ancestors of develop while removing their content. Measured after #24 landed:

                     before #24    after #24
#22 conflicts             5            9
#20 conflicts             4           10
#21                   mergeable    UNMERGEABLE  ("Already up to date", content does not return)

I checked the resulting tree matched the pre-merge commit — it did, byte for byte — but merge behaviour follows history, not content, and I didn't check that. So #21 became impossible to re-merge, and every file #22 and #20 share with that stack started looking deleted-on-develop.

What this PR does

The documented git fix: revert the revert. Verified before opening:

Where that leaves sequencing

#21 lands first, which isn't the order I wanted, but undoing it costs more than accepting it. #22 still merges next — onto a develop that already contains #21 — and #20 after that. The original reason for the ordering (#22 carries the migration baseline repair and the test harness) still holds and is unchanged by this.

No code is modified. This is purely a history correction.

🤖 Generated with Claude Code

@mcfarhat
mcfarhat merged commit 1891cef into develop Aug 11, 2026
2 checks passed
@mcfarhat
mcfarhat deleted the fix/restore-relationship-lore-graph branch August 11, 2026 19:20
@github-actions

Copy link
Copy Markdown

Vercel preview is ready:

https://hivelore-9kv108g4i-kareemn1936s-projects.vercel.app

Commit: c14598f

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant