[DISCUSS] new way of github working

Devs, I see a lot of merge master to branch commits appearing on PRs. This is against prior (non-hard) agreements on how we work. It is getting to be the daily practice so; How do we feel about 1. not using merge commits anymore? 2. merging back as a way of solving conflicts? and Do we need to mak

Re: [DISCUSS] new way of github working

Hi On 01/08/2018 10:45 AM, Daan Hoogland wrote: > Devs, > > I see a lot of merge master to branch commits appearing on PRs. This is > against prior (non-hard) agreements on how we work. It is getting to be the > daily practice so; > How do we feel about > 1. not using merge commits anymore? > 2.

Re: [DISCUSS] new way of github working

I did not fully understand what you meant. Are you talking about the merge commit that can be created when a PR is merged? Or, are you talking about a merge commit that is added to a PR when a conflict is solved by its author(s)? I do not have problems with the first type of merge commits. Howev

Re: [DISCUSS] new way of github working

Same opinion as Rafael described. On Mon, Jan 8, 2018 at 11:30 AM, Rafael Weingärtner < rafaelweingart...@gmail.com> wrote: > I did not fully understand what you meant. > > Are you talking about the merge commit that can be created when a PR is > merged? Or, are you talking about a merge commit t

Re: [DISCUSS] new way of github working

Just a note Daan. If a PR is merged with the `git pr ` tool in our utilities folder, it will automatically include the merge commit. Figured I should mention that... *Will Stevens* CTO On Mon, Jan 8, 2018 at 8:26 AM, Marc-Aurèle Brothier wrote: > Same opinion as R

Re: [DISCUSS] new way of github working

f Will Stevens Sent: Monday, January 8, 2018 11:34:42 AM To: dev@cloudstack.apache.org Subject: Re: [DISCUSS] new way of github working Just a note Daan. If a PR is merged with the `git pr ` tool in our utilities folder, it will automatically include the merge commit. Figured I should mentio

Re: [DISCUSS] new way of github working

2 AM To: dev@cloudstack.apache.org Subject: Re: [DISCUSS] new way of github working Just a note Daan. If a PR is merged with the `git pr ` tool in our utilities folder, it will automatically include the merge commit. Figured I should mention that... *Will

Re: [DISCUSS] new way of github working

g merge > commits in a PR > > Obtener Outlook para Android<https://aka.ms/ghei36> > > > From: williamstev...@gmail.com on behalf > of Will Stevens > Sent: Monday, January 8, 2018 11:34:42 AM > To: dev@cloudstack.apa

Re: [DISCUSS] new way of github working

_____ >> From: williamstev...@gmail.com on behalf >> of Will Stevens >> Sent: Monday, January 8, 2018 11:34:42 AM >> To: dev@cloudstack.apache.org >> Subject: Re: [DISCUSS] new way of github working >> >> Just a note Daan.

Re: [DISCUSS] new way of github working

asing the target branch and push force instead of including merge > >> commits in a PR > >> > >> Obtener Outlook para Android<https://aka.ms/ghei36> > >> > >> > >> From: williamstev...@gmail.com on behalf &g

Re: [DISCUSS] new way of github working

On 01/15/2018 09:06 PM, Rafael Weingärtner wrote: > Daan, > > Now that master is open for merges again, can we get a feedback here? It > might be interesting to find a consensus and a standardize way of working > for everybody before we start merging things in master again … +1 to allow merge c

Re: [DISCUSS] new way of github working

These last two months I have experimented working with both ways (maintaining the merge commit and squashing and merging). When I experimented using “squash+merge”, the only time I was maintaining the merge commit is during merge-forwards. I liked working with “squash+merge” approach. This allowed

Re: [DISCUSS] new way of github working

Hi everyone, We had a good conversation going here. Maybe we can continue it, get some level of reasonable consensus, and implement it (if, in fact, the consensus is a change from what we currently have). My suggested approach is the following: Before you create a PR, squash all applicable com

Re: [DISCUSS] new way of github working

I think we are on the same page here. There is only one thing that is different from what we are doing in PRs. > Before you create a PR, squash all applicable commits to make it more > readable for reviewers > I would suggest not squashing everything before creating the PR. I mean, do the followi

Re: [DISCUSS] new way of github working

ck.apache.org> From: Rafael Weingärtner Sent: Wednesday, May 2, 2018 4:53:41 PM To: dev Subject: Re: [DISCUSS] new way of github working I think we are on the same page here. There is only one thing that is different from what we are doing in PRs. > Before you crea