Re: Merge strategy

2018-10-30 Thread Daniel Kulp
o's dev-community's opinion on the merge strategy > of pull requests. By default Github supports three options: > - Create a merge commit > - Squash and merge > - Rebase and merge > https://help.github.com/articles/about-merge-methods-on-github/ > <https://help.github.com/articles/

Re: Merge strategy

2018-10-30 Thread Niels Basjes
, signed commits, > > “real” authors, or whatever criteria makes sense, then I’m all for it. > > > > Cheers, > > Michael Smith/kojiromike > > > > On Tue, Oct 23, 2018 at 17:19 Driesprong, Fokko > > wrote: > > > > > Hi all, > > > &g

Re: Merge strategy

2018-10-25 Thread Doug Cutting
> > [image: image.png] > > > > I would like to get the Avro's dev-community's opinion on the merge > > strategy of pull requests. By default Github supports three options: > > - Create a merge commit > > - Squash and merge > > - Rebase and merge > > h

Merge strategy

2018-10-23 Thread Driesprong, Fokko
Hi all, Allow me to start the great debate. [image: image.png] I would like to get the Avro's dev-community's opinion on the merge strategy of pull requests. By default Github supports three options: - Create a merge commit - Squash and merge - Rebase and merge https://help.github.com/articles