chore: add postMergeReverts to upstream merge history and skill workflow#272
Merged
Merged
Conversation
Record scratch-blocks v2→v1.3.0 downgrade (PR #271) as a post-merge revert in .upstream-merge-history.json so the next upstream merge can handle affected files correctly. Update upstream-merge skill (SKILL.md, phase1, phase2, phase4) to: - Document postMergeReverts JSON schema - Check for reverts in Phase 1 and prompt user for resolution strategy - Add conflict resolution guidance for both "accept upstream" and "maintain revert" strategies in Phase 2 - Handle postMergeReverts cleanup in Phase 4 Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
|
🚀 Preview deployed: https://smalruby.jp/smalruby3-editor/chore/update-merge-history-post-revert/ |
github-actions Bot
pushed a commit
that referenced
this pull request
Mar 11, 2026
…merge-history-post-revert chore: add postMergeReverts to upstream merge history and skill workflow
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
PR #271 で scratch-blocks v2.0.3 → v1.3.0 にダウングレードした結果、
.upstream-merge-history.jsonのlastMergeが示す「取り込み済み」状態と実際のコードに乖離が生じた。次回の upstream merge でスムーズにコンフリクト解決できるよう、以下を対応:
.upstream-merge-history.jsonにpostMergeRevertsフィールドを追加し、revert の範囲・理由・影響ファイル・次回マージ時のガイダンスを記録postMergeReverts対応に更新Changes
.upstream-merge-history.jsonpostMergeReverts配列を追加（PR fix: downgrade scratch-blocks from v2.0.3 to v1.3.0 to restore custom block argument dragging #271 の scratch-blocks ダウングレード情報）nextMergeGuidanceに方針A/B の判断基準を記載.claude/skills/upstream-merge/SKILL.mdpostMergeRevertsの JSON スキーマをドキュメント化.claude/skills/upstream-merge/phase1-prepare.mdpostMergeRevertsの存在チェックとユーザーへの方針確認フロー追加affectedAreasの重複確認追加.claude/skills/upstream-merge/phase2-conflicts.md.claude/skills/upstream-merge/phase4-finalize.mdpostMergeReverts処理ルール追加（方針に応じてクリアまたは維持）