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

Process for commits #8

Closed
awoods opened this issue May 14, 2015 · 8 comments
Closed

Process for commits #8

awoods opened this issue May 14, 2015 · 8 comments

Comments

@awoods
Copy link
Member

awoods commented May 14, 2015

Hello Team,
Pull-requests are beginning to stack up in this project.
We should define a process by which we, as committers, can be responsive to PRs.

Majority committer 👍 with no 👎 ?

@ruebot
Copy link
Contributor

ruebot commented May 14, 2015

👍

1 similar comment
@azaroth42
Copy link
Contributor

👍

@escowles
Copy link
Contributor

👍 and #7 is ready to merge

@ruebot
Copy link
Contributor

ruebot commented May 14, 2015

Given the squashing involved in #7, should we have a process for merging? Sometimes we can just click the nice 'Merge' button here, other times we need to merge manually (rebasing). For the manual merging, is that whoever is around, and calls it? Or, should it just be @awoods?

@awoods
Copy link
Member Author

awoods commented May 14, 2015

I guess it is a matter of taste. If commits are more meaningful when left separate, then leaving them separate makes sense. If a squash makes the intent of the final commit more clear, then squashing makes sense.
My preference is to have as clean and meaningful history as possible. @awoods certainly does not have a monopoly on squashing, but I am happy to do it in the face of a collection of wandering commits.

Maybe the process could be:

  • If a PR has only one commit, click the button to merge
  • If a PR has more than one commit, decide with the contributor if a squash is appropriate
  • In either case, the contributor should never commit his/her own PR.

@ruebot
Copy link
Contributor

ruebot commented May 14, 2015

👍 to that!

@escowles
Copy link
Contributor

👍 that sounds good to me -- and I'm also happy to squash commits as needed.

@awoods
Copy link
Member Author

awoods commented May 24, 2015

3 of 5 committers. I guess the process is official.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

4 participants