Repository navigation
feat(tests): fork sync merges a change declaring Fork-merge: ours as a fork must - #1971
Merged
Merged
Conversation
…a fork must Part of #1944. Co-Authored-By: Claude Opus 5.5 <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.
Part of #1944 (the last prerequisite before the split).
The split conflicts on a plain merge by design: ADR-049 rule 8 has a fork take it with
git merge -s ours. Without this PR, FS-03 fails the split PR withconflicts outside the fork's own documents: ['templates/manifest.yaml'].Change. When a commit in
base..upstreamcarries the trailerFork-merge: ours, FS-03:-s ours, keeping the fork's treebase:,backend:andfrontend:into the fork's ownfork:key, and every dropped core ID intofork_core(feat(tools): read a fork's own manifest keys and its fork_core additions #1970). This is the migration a fork makes, and Write the v3.0 migration guide for consuming projects and forks #1292's guide will describe itSAIT_UPSTREAM_REFat upstream, so SYS-20 checks that the fork now leaves upstream's keys aloneWithout the trailer, nothing changes.
Measured on the real split (scratch worktree: the local split branch with main merged in and this runner, trailer committed):
fork:,base-readmemoved tofork_core, nested smoke 36/36Test changes: a new FS-03 path, and spec MNF-06 gains Execution step 4 and the assertion for it. The existing paths are unchanged (main: 3/3, nested smoke 36/36).
Local (Git Bash): smoke 36/36, conformance 24 / 0 failed, fork sync 3/3. No CHANGELOG entry: this changes this repository's own tests.
🤖 Generated with Claude Code