Repository navigation
Restore the relationship lore graph work (revert of #24) - #25
Merged
Merged
Conversation
This reverts commit 07347c8.
|
Vercel preview is ready: https://hivelore-9kv108g4i-kareemn1936s-projects.vercel.app Commit: c14598f |
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
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.
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
developto 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
developwhile removing their content. Measured after #24 landed: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:
lore.tsand the rest of the stack are restoreda64edb4, the state immediately after Feature/m2 relationship lore graph kareem #21 mergedWhere 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
developthat 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