This repository was archived by the owner on Nov 12, 2026. It is now read-only.
Repository navigation
Union-merge OS9-HANDOFF.md and ROADMAP.md - #612
Merged
Merged
Conversation
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Nearly every PR prepends an entry to these two logs, so concurrent PRs conflict in them every time (#598, #601, #590, #533 all did).
merge=unionkeeps both sides with no markers.Scope: honored by local
git merge/rebase(how agents update branches). GitHub's web merge and 'Update branch' ignore custom merge drivers, so PRs still need a local merge ofdevfirst. Entry order may interleave but nothing is lost.