CONTRIBUTING update for the github squash button.#4087
Merged
fjy merged 1 commit intoapache:masterfrom Mar 21, 2017
Merged
Conversation
Some changes to the contributing guidelines to make pull requests easier to review.
Contributor
|
👍 |
Member
|
Another problem is that CONTRIBUTING.md suggests to do rebases, instead of merging master into feature branch. Rebases are very inconvenient for reviewing, because reviewer cannot separately look at changes that he hasn't yet reviewed, and also older comments to the code are lost. Before Github used to display full diffs of merge commits so it was also inconvenient for reviewing. But now Github always displays diff between the feature branch and the current master, so this problem is gone. |
Contributor
Author
|
I think the changes address that concern, it now says:
|
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.
Some changes to the contributing guidelines to make pull requests
easier to review. The existing guidelines were written back when github
didn't have a squash-and-rebase feature, so people had to squash
their own commits. Now it's easier if they don't.