doc: Add note in CONTRIBUTING.md about force-pushing #4013
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
slarse
changed the title
|
It is mentioned in passing that the PR is squashed ("Spoon integrators check the quality of the squashed merge commit message", Emphasis mine), but highlighting that in the force-push paragraph might be useful? I normally force-push if I did something stupid and another commit will just be confusing if it ends up in the repo's history. If the PR is squashed anyways, I do not have to care about maintaining a proper history. Explicitly stating "hey, a clean history is useful but your PR will be squashed anyways" might help a bit in alleviating the contributor's guilt :) |
|
@I-Al-Istannen Good point, I've included a mention of that :) |
monperrus
changed the title
|
Thanks for the clarification. |
Merged
woutersmeenk
pushed a commit
to woutersmeenk/spoon
that referenced
this pull request
Aug 29, 2021
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.
IMO it's pretty confusing to leave feedback on a PR, and then have the author of that PR force-push changes to it such that the parts that were reviewed are no longer even part of the PRs commit history.
This PR adds a note to the CONTRIBUTING.md about avoiding force-pushing when collaborating on a PR (e.g. after receiving a review).
@monperrus @nharrand Thoughts on the general idea and potentially the phrasing in the docs?