ci: gist-based conflict resolution for v4 → v4-next sync#21711
Draft
ci: gist-based conflict resolution for v4 → v4-next sync#21711
Conversation
- Post to Slack at most once per day (new top-level message) - Subsequent conflicts same day get thread-replies instead - Slack thread TS/channel stored in gist's state.json file - Thread-reply template in v4-v4next-slack-thread-reply.txt
c03c49b to
373772b
Compare
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
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
Replaces the current v4 → v4-next conflict handling (which creates a PR with conflict markers + spams Slack/ClaudeBox on every v4 push) with a gist-based approach:
.github/prompts/*.txtfor easy editingWhat changes vs today
sync/v4-into-v4-next-*branches accumulateFiles
.github/workflows/pull-v4-into-v4-next.yml— rewritten workflow.github/prompts/v4-v4next-conflict-summary.txt— gist markdown template.github/prompts/v4-v4next-slack-conflict.txt— Slack notification template.github/prompts/v4-v4next-claudebox-resolve.txt— ClaudeBox prompt for resolutionBased on design: https://gist.github.com/AztecBot/b44f2a2d3afaada77d1033174c49b6c4