docs(claude): add Conflict resolution discipline section (lessons from #62/#63) - #64
Merged
Merged
Conversation
Codifies the lessons from PRs #62, #63 — Wave 7's misuse of `git checkout --theirs` on `networking.tsx` / `networking.test.ts` silently dropped upstream's Memory CRUD additions and broke the Docker build. Two follow-up PRs were needed to recover. New `CLAUDE.md` section "Conflict resolution discipline" (placed right after "Upstream sync cadence") with 5 rules: 1. Default to manual 3-way merge for any large file or upstream-active file (router.py, proxy_server.py, networking.tsx, auth/*, ...). 2. `--ours` is acceptable when our patch ships content via separate files (Wave 6c pattern). 3. `--theirs` is almost never correct; if tempted, instead take HEAD as the base and re-apply the cherry-pick's logic onto it. 4. After any conflict resolution, verify line-count sanity (`git diff --stat`), build/import smoke, and targeted tests — skipping any of these is what let PR #61 ship broken. 5. PR description must document the per-file strategy + verification evidence (line-count diff + build/test smoke outputs). `.github/pull_request_template.md` gains a "Conflict resolutions" section between "Tier classification" and "Relevant issues" so the strategy + evidence land in every cherry-pick PR going forward. Tier: B (internal infra / policy doc).
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.
Codifies the 5 rules from the v1.87.0 bump aftermath. PR template gains required "Conflict resolutions" section.