Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Contribution guide: add guidance for when to add commits to a PR vs. amending/squashing #14773

Closed
akoeplinger opened this issue Jun 29, 2015 · 2 comments
Milestone

Comments

@akoeplinger
Copy link
Member

It's often not clear how to react to code review feedback (e.g. see the discussion here), should you add a new commit or just amend the previous one?

I think it'd be good to have an "official" guidance on this in the contributing doc to prevent confusion.

@stephentoub's response looks like a good basis to me:

In this case I'd suggesting adding additional commits and then squashing later. Personally, I prefer to just ammend the existing commit when the changes are small / trivial and I don't expect anyone to need to re-review, e.g. fixing up typos or making simple one-line fixes. For larger things, I prefer to have the additional commits so that it's clear to a reviewer what's changed.

Thoughts?

@Maxwe11
Copy link
Contributor

Maxwe11 commented Jun 29, 2015

dup #14315

@akoeplinger
Copy link
Member Author

Thanks, glad it's not just me 😄

Closing this, but it'd be great if @terrajobst or @richlander could take a look at #14315 and discuss how we should move forward.

@msftgits msftgits transferred this issue from dotnet/corefx Jan 31, 2020
@msftgits msftgits added this to the 1.0.0-rtm milestone Jan 31, 2020
@ghost ghost locked as resolved and limited conversation to collaborators Jan 5, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

No branches or pull requests

3 participants