Resolve O4d rc3/rc4 CHANGES.rst conflict - #320
Merged
Merged
Conversation
Sync junior rift_O4d into upstream rift_O4d
oshaughnessy-junior
deployed
to
private-review-dispatch-rift
September 11, 2026 00:09 — with 
GitHub Actions
Active
GitHub Actions
Active
![interhost-cross-review-canary-v2[bot]](https://avatars.githubusercontent.com/u/274802661?s=60&v=4){kind=small}
oshaughnessy-junior
deployed
to
private-review-dispatch-rift
September 11, 2026 00:12 — with
GitHub Actions
Active
GitHub Actions
Active
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.
Resolves the CHANGES.rst conflict with oshaughn/rift_O4d for upstream PR oshaughn#191.\n\nKeeps the concise rc0--rc3 release history from the base, adds a focused rc4-pending summary for the fork payload, and retains setup.py at rc3 until the post-merge rc4 release update.