docs(todo): mark the -s ours alignment merge as folded into release-cut#1092
Merged
Merged
Conversation
PR #1089 folded the `git merge -s ours --allow-unrelated-histories origin/main` history-alignment step into the `release-cut` Makefile target. Three passages across two TODO items still told the reader it was a manual step. The most consequential was in the Phase 8 item under planning/, which is forward-looking guidance: it instructed a future release cutter to perform the merge by hand. That is now wrong and would have produced a redundant second merge. The two passages in release-recovery-v0-3-1 are historical records of the v0.3.1 cut, so they keep the past tense ("release-cut did not do this at the time") and gain a pointer to #1089 rather than being rewritten as if the target always had the merge. Incidentally makes the pre-existing "(both fixed, see w7)" line in release-recovery-v0-3-1 true: at the time it was written only one of the two gaps was actually fixed. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
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
1 participant
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.
PR #1089 folded the
git merge -s ours --allow-unrelated-histories origin/mainhistory-alignment step into therelease-cutMakefile target.Three passages across two TODO items still told the reader it was a manual
step.
The most consequential was in the Phase 8 item under planning/, which is
forward-looking guidance: it instructed a future release cutter to perform
the merge by hand. That is now wrong and would have produced a redundant
second merge.
The two passages in release-recovery-v0-3-1 are historical records of the
v0.3.1 cut, so they keep the past tense ("release-cut did not do this at the
time") and gain a pointer to #1089 rather than being rewritten as if the
target always had the merge.
Incidentally makes the pre-existing "(both fixed, see w7)" line in
release-recovery-v0-3-1 true: at the time it was written only one of the two
gaps was actually fixed.
Co-Authored-By: Claude Opus 4.8 noreply@anthropic.com