fix(stack): merge AGENTS Discord + product rules; unblock integration rebase - #161
Merged
Merged
Conversation
Stack sync fails rebasing fork/integration onto fork/changes on AGENTS.md while replaying overlay #146. Neither pure ours nor pure theirs is safe: #146 has Discord co-author / always-open-draft rules; #156 has product- conflict and existence-test rules. Merge both into fork/changes AGENTS, record durable policies: - fork/changes AGENTS → theirs (fork layer rewrite) - fork/integration AGENTS + docs/fork-stack.md → ours (keep complete base) Local sync --dry-run succeeds with these resolutions.
patroza
added a commit
that referenced
this pull request
Jul 29, 2026
…cs (#161) Stack sync fails rebasing fork/integration onto fork/changes on AGENTS.md while replaying overlay #146. Neither pure ours nor pure theirs is safe: #146 has Discord co-author / always-open-draft rules; #156 has product- conflict and existence-test rules. Merge both into fork/changes AGENTS, record durable policies: - fork/changes AGENTS → theirs (fork layer rewrite) - fork/integration AGENTS + docs/fork-stack.md → ours (keep complete base) Local sync --dry-run succeeds with these resolutions. Co-authored-by: T3 Code PR Stack <41898282+github-actions[bot]@users.noreply.github.com>
patroza
added a commit
that referenced
this pull request
Jul 29, 2026
…cs (#161) Stack sync fails rebasing fork/integration onto fork/changes on AGENTS.md while replaying overlay #146. Neither pure ours nor pure theirs is safe: #146 has Discord co-author / always-open-draft rules; #156 has product- conflict and existence-test rules. Merge both into fork/changes AGENTS, record durable policies: - fork/changes AGENTS → theirs (fork layer rewrite) - fork/integration AGENTS + docs/fork-stack.md → ours (keep complete base) Local sync --dry-run succeeds with these resolutions. Co-authored-by: T3 Code PR Stack <41898282+github-actions[bot]@users.noreply.github.com>
patroza
added a commit
that referenced
this pull request
Jul 29, 2026
…cs (#161) Stack sync fails rebasing fork/integration onto fork/changes on AGENTS.md while replaying overlay #146. Neither pure ours nor pure theirs is safe: #146 has Discord co-author / always-open-draft rules; #156 has product- conflict and existence-test rules. Merge both into fork/changes AGENTS, record durable policies: - fork/changes AGENTS → theirs (fork layer rewrite) - fork/integration AGENTS + docs/fork-stack.md → ours (keep complete base) Local sync --dry-run succeeds with these resolutions. Co-authored-by: T3 Code PR Stack <41898282+github-actions[bot]@users.noreply.github.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.
Summary
Stack sync fails while rebasing
fork/integrationontofork/changeson AGENTS.md (replay of #146). Puretheirswould drop #156 product-conflict / existence-test rules; pureourswould drop #146 Discord co-author + always-open-draft rules.AGENTS.mdonfork/changesconflictResolutions:fork/changes+AGENTS.md→theirs(fork layer rewrite)fork/integration+AGENTS.md/docs/fork-stack.md→ours(keep complete base after merge)Local
node scripts/rebase-pr-stack.ts sync --dry-runsucceeds.Test plan
vp checksync --dry-rungreen