Repository navigation
CONTRIBUTING.md: how pull requests avoid editing the same lines - #379
Merged
Merged
Conversation
NEWS entries go to changes/, REVIEW.md in batches, README only for user-visible changes, one concern per branch, tests not loosened. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Found by nc-oc-gpt61t: name the release exception for debian/changelog, and don't forbid force pushes to contributor branches (.claude/CLAUDE.md says to rebase when a branch no longer merges cleanly). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
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.
Adds a short CONTRIBUTING.md, so that a contributor sees the rules that keep parallel pull requests from conflicting before editing NEWS (until now only in
changes/README.mdand.claude/CLAUDE.md):changes/<branch>.md;mainin when the branch no longer merges cleanly (no force pushes);trunkis the SVN mirror.Docs only.
🤖 Generated with Claude Code