docs: merge policy for conflict resolution - #1209
Merged
Samuel1-ona merged 1 commit intoAug 27, 2026
Merged
Conversation
Implements Samuel1-ona#1146: - explicit rule: never keep both sides of a conflicting hunk (31 files were damaged this way per the issue) - post-resolution verification commands (duplicate route/export checks, pnpm build) - requires rebasing on main + full local check before requesting review - documents the local parse/build verification step
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
2 participants
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.
What
Adds the explicit merge policy to
CONTRIBUTING.mdthat #1146 asks for: how to resolve conflicts correctly and verify afterwards.Why
The recurring damage pattern is conflict resolutions that keep both sides of a hunk — 31 files were affected. Duplicate routes/components sometimes compile but break at runtime far from the cause.
Contents
pnpm buildmain(with--force-with-lease) before requesting reviewpnpm lint && pnpm test && pnpm build) after rebasingResolves #1146