Hi Vihang,

As you, I like the new infra very much!

I have opinion /answer for 2 of your questions below:

VK > 1. Whether to standardize on Squash into one commit

I think we should squash. The final code should not be polluted with the
meandering way we sometimes arrive to the final solution in some patch
processes with multiple reviewers.

VK > 3. Do committers merge the PR directly from the github?

Yes, I do. There is a possibility to connect your apache account to the
github account. You have to set-up 2 factor authentication for that. I
believe one of David Mollitor's previous letter contains more info on that.

I do not have that stong opinion on question 2. I believe that if the title
of the jira is good enough then it should be enough as a commit message
too. OTOH the PR/Jira discussion should contain the reasoning/debate behind
the scenes. But probably that's just me already adjusted to the status quo

Thanks, Peter

Vihang Karajgaonkar <vihan...@apache.org> ezt írta (időpont: 2020. jún.
30., Ke 21:31):

> Thanks to all who worked on the new testing infrastructure. It definitely
> looks like a step up from the older test infrastructure.
> I wanted to know if there are any new guidelines for a committer for
> merging the PRs. Earlier we used to create one patch file for each JIRA and
> push it to the master branch. With PRs it is possible that a
> contributor publishes multiple commits (eg. to address review comments). I
> would like to start a discussion on what should be the guidelines on
> merging the PR requests?
> Most of you are probably already following it but it would be good to
> formalize the following:
> 1. Whether to standardize on Squash into one commit
> <
> https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/about-pull-request-merges#squash-and-merge-your-pull-request-commits
> >
> for the PR?
> 2. What are the commit message guidelines? Our project has unfortunately
> not been great in documenting the commit message appropriately. Current
> guidelines are to have one line commit message and the JIRA is expected to
> have more detailed information. However, most of the time the JIRAs  don't
> have enough information. I think it would be good to add a few lines of
> description as part of the git commit message. Some projects recommend
> 50/72
> formatting
> <
> https://stackoverflow.com/questions/2290016/git-commit-messages-50-72-formatting
> >
> for
> the git commit message which I feel is nice.
> 3. Do committers merge the PR directly from the github? I am not sure if
> there is a way for our committer credentials to be integrated in github.
> Otherwise, the other option could be that the committer checks out the PR
> and merges it manually into the master branch.
> Thanks,
> Vihang

Reply via email to