Re: Merging changes in the GitBox era

Thanks all for the feedback. I created INFRA-16245 and linked to this thread. On Mon, Mar 26, 2018 at 9:49 AM, Zoltan Ivanfi wrote: > I'm fine with that as well, I don't have a strong opinion on this one. And > we can also

Re: Merging changes in the GitBox era

I'm fine with that as well, I don't have a strong opinion on this one. And we can also remove it any time later. Zoltan On Mon, Mar 26, 2018 at 6:43 PM Ryan Blue wrote: > I think we can rely on the "Squash and Merge" default to avoid the commits > that will dirty the

Re: Merging changes in the GitBox era

I think we can rely on the "Squash and Merge" default to avoid the commits that will dirty the commit log. If you have to select "Rebase and Merge" to use it, I think it will probably be fine. And it is nice to have the option. rb On Mon, Mar 26, 2018 at 9:26 AM, Zoltan Ivanfi

Re: Merging changes in the GitBox era

I think we should, otherwise we may accidentally end up with a commit history full of micro-changes like "Initial commit for feature", "Address reviewer1's comments", "Address reviewer2's comments". Zoltan On Mon, Mar 26, 2018 at 6:06 PM Lars Volker wrote: > I think we only

Re: Merging changes in the GitBox era

I think we only need "Rebase and Merge" for cases where we want to submit a single PR as multiple commits, e.g. if a PR fixes two JIRAs that somehow depend on each other but shouldn't be squashed. Those seem a bit hypothetical to me. However, "Rebase and Merge" does prevent the kind of merge

Re: Merging changes in the GitBox era

To answer my second question: Just tried "Squash and Merge" and I could edit the commit message. Looks good. Zoltan On Mon, Mar 26, 2018 at 2:26 PM Zoltan Ivanfi wrote: > +1 and thanks for taking care of this. I would like to have 2 questions > though: > >- Do we need

Re: Merging changes in the GitBox era

+1 and thanks for taking care of this. I would like to have 2 questions though: - Do we need "Rebase and Merge"? - What will be the commit message of a "Squash and Merge"? Thanks, Zoltan On Sun, Mar 25, 2018 at 11:45 AM Uwe L. Korn wrote: > +1 > > On Fri, Mar 23,

Re: Merging changes in the GitBox era

+1 On Fri, Mar 23, 2018, at 11:57 PM, Ryan Blue wrote: > +1 > > On Fri, Mar 23, 2018 at 11:01 AM, Wes McKinney wrote: > > > +1 > > > > On Fri, Mar 23, 2018 at 1:56 PM, Lars Volker wrote: > > > I checked with the Infra team and they can disable some of

Re: Merging changes in the GitBox era

+1 On Fri, Mar 23, 2018 at 1:56 PM, Lars Volker wrote: > I checked with the Infra team and they can disable some of the options for > us. Before opening a Jira I'd like to get some more feedback here. The > options are: > >- Disable Merge commits >- Keep "Squash and

Re: Merging changes in the GitBox era

I checked with the Infra team and they can disable some of the options for us. Before opening a Jira I'd like to get some more feedback here. The options are: - Disable Merge commits - Keep "Squash and Merge" and "Rebase and Merge" - Keep "Squash and Merge" as the default. This is what

Re: Merging changes in the GitBox era

You may be able to ask ASF Infra to disallow merge commits in the GitHub UI to prevent this from happening On Fri, Mar 23, 2018 at 11:18 AM, Lars Volker wrote: > Both of these merges are on me, I wasn't aware aware that they would show > up like this. I personally prefer the

Re: Merging changes in the GitBox era

Both of these merges are on me, I wasn't aware aware that they would show up like this. I personally prefer the format provided by the dev/merge.py script. Since 2016 Github supports "Rebase and Merge" as a second option when submitting PRs: