chore: remove upstream merge notes#239
Merged
Merged
Conversation
These documentation files were accidentally committed during the upstream merge. They are internal working notes and should not be in the repository. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
|
🚀 Preview deployed: https://smalruby.jp/smalruby3-editor/fix/remove-merge-notes/ |
- Remove Phase 5 (Documentation Generation) that created files in notes/ - Change `git add .` to `git add -u` to respect .gitignore - Use explicit file paths for git add (e.g., .upstream-merge-history.json only) - Add known conflicts: blocks.jsx, eslint.config.mjs, package.json - Add ScratchBlocks API Migration Guide (v2.0.0 changes) - Add Known Test Fix Patterns (category clicks, CSS selectors, Date mocking) - Document batch execution for integration tests - Add Gemini and Mesh v2 to manual testing checklist Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Move from single .claude/commands/upstream-merge.md to .claude/skills/upstream-merge/ with separate files per phase: - SKILL.md: entry point with overview and critical rules - phase1-prepare.md: prerequisites, branch creation, merge execution - phase2-conflicts.md: known conflict resolution guides - phase3-validation.md: commit, lint, build, tests, CI - phase4-finalize.md: merge history, PR creation, manual testing - reference-api-migration.md: ScratchBlocks API changes - reference-test-patterns.md: known test fix patterns This reduces context consumption during the long merge workflow by loading only the relevant phase file at each step. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
- code-style.md: add marker comment format and rules - scratch-gui/development.md: list all 12 markers across 8 files + 3 Smalruby-specific files - scratch-vm/development.md: list extension registration marker Markers use `// === Smalruby: Start/End of <feature> ===` format to clearly delineate Smalruby customizations in upstream files, making conflict resolution during upstream merges predictable. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
github-actions Bot
pushed a commit
that referenced
this pull request
Mar 8, 2026
…rge-notes chore: remove upstream merge notes
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
Remove
notes/upstream/merge-2026-03/directory that was accidentally committed during the upstream merge (PR #238).These are internal working notes (progress tracking, conflict resolutions, test results) and should not be in the repository.
🤖 Generated with Claude Code