This repository has been archived by the owner on Apr 26, 2024. It is now read-only.
Update CONTRIBUTING.md about merging PRs. #6846
Merged
Conversation
This file contains 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
anoadragon453
suggested changes
Feb 4, 2020
neilisfragile
approved these changes
Feb 4, 2020
CONTRIBUTING.md
Outdated
| We aim to have a clean merge history, which means we normally squash-merge | ||
| changes into develop. For small changes this means there is no need to rebase | ||
| to clean up your PR before merging. Larger changes with an organised set of | ||
| commits may be merged as-is, if the history is judged useful. |
There was a problem hiding this comment.
'judged to be useful'?
michaelkaye
commented
Feb 4, 2020
babolivier
pushed a commit
that referenced
this pull request
Sep 1, 2021
* commit 'c87572d6e': Update CONTRIBUTING.md about merging PRs. (#6846)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Update contributing to add new suggested section on Merge Strategy based on chat on synapse-dev.
(I don't care about the details of this, I think I've captured the idea, but feel free to bikeshed as required. All I'm looking for is the intent written down so I don't forget to ask each time).