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

Provide clear contributing guidelines about rebasing in PRs #1163

Closed
victornoel opened this issue Jul 14, 2019 · 9 comments
Closed

Provide clear contributing guidelines about rebasing in PRs #1163

victornoel opened this issue Jul 14, 2019 · 9 comments

Comments

@victornoel
Copy link
Collaborator

Following some discussions:

I think we need clear guideline about what is expected of DEV concerning changes made after REV comments as well as about merging vs rebasing w.r.t. master branch in case of conflicts.

@0crat
Copy link
Collaborator

0crat commented Jul 14, 2019

@llorllale/z please, pay attention to this issue

@victornoel
Copy link
Collaborator Author

For the record, until now I was more for rebasing all the time, but I kind of had my mind changed (not 100%) so I would like to have a clear guideline so as not to think anymore about it :)

/cc @scristalli

@victornoel
Copy link
Collaborator Author

@llorllale I wasn't aware of it, but it seems that I am not the only one bothered by this kind of questions: https://github.com/zerocracy/zerocracy.github.io/pull/103#issuecomment-509644947

@llorllale
Copy link
Contributor

@victornoel it's certainly cleaner for the project as a whole if each commit corresponds to exactly one issue.

On the other hand, it would make it difficult for a DEV to revert changes as he is working to have his PR merged (he may be asked to revert a subset of the change). But then again - these are microtasks we're talking about, so perhaps this shouldn't be a big issue.

I think I lean more towards a single commit per PR, but how can we reliably enforce that? One step would be to add that check in the Zerocracy QA policy, but it would be even better if there were some github app that does it.

Note: I don't care much for rebasing per se - all I'd like is a single commit per PR.

@victornoel
Copy link
Collaborator Author

@llorllale I don't think we need to enforce it (and there always will be some special cases), but at least a clear ruling and guidelines would be helpful to not spend time discussing this between DEV and REV.

In the ghman project, the guidelines are in the README for example, so that DEV and REV can refer to it.

@llorllale
Copy link
Contributor

@victornoel Am I missing something? There is nothing related to commits in neither https://github.com/g4s8/ghman/blob/master/README.md nor https://github.com/g4s8/ghman/tree/master/.github

@llorllale
Copy link
Contributor

@victornoel I'm assuming the default rules of Zerocracy apply

@victornoel
Copy link
Collaborator Author

@llorllale it's not yet merged: g4s8/ghman#67

Which default rules are you referring to? I may have missed something there!

@0crat
Copy link
Collaborator

0crat commented Jul 4, 2020

Job gh:yegor256/cactoos#1163 is not assigned, can't get performer

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

3 participants