, 2021 9:13 AM
To: dev@geode.apache.org
Subject: Re: Fw: [DISCUSS] Rebase and Squash Options on Github develop
+1
From: Jens Deppe
Sent: Tuesday, June 29, 2021 7:44 AM
To: dev@geode.apache.org
Subject: Re: Fw: [DISCUSS] Rebase and Squash Options on Github develop
+1
From: Jens Deppe
Sent: Tuesday, June 29, 2021 7:44 AM
To: dev@geode.apache.org
Subject: Re: Fw: [DISCUSS] Rebase and Squash Options on Github develop
+1 For Naba’s proposal
From: Joris Melchior
Date: Tuesday, June 29, 2021 at 7:40 AM
To: dev
+1 For Naba’s proposal
From: Joris Melchior
Date: Tuesday, June 29, 2021 at 7:40 AM
To: dev@geode.apache.org
Subject: Re: Fw: [DISCUSS] Rebase and Squash Options on Github develop
+1 for Naburan’s proposed options.
From: Nabarun Nag
Date: Monday, June 28, 2021 at 4:06 PM
To: Owen Nichols
+1 for Naburan’s proposed options.
From: Nabarun Nag
Date: Monday, June 28, 2021 at 4:06 PM
To: Owen Nichols , dev@geode.apache.org
Subject: Re: Fw: [DISCUSS] Rebase and Squash Options on Github develop
Just a clarification.
The options I am proposing to be kept in the PRs are:
* Squash
+1 to keep only "Squash and merge" and "Rebase and merge".
Aaron Lindsey
From: Robert Houghton
Sent: Monday, June 28, 2021 2:31 PM
To: dev@geode.apache.org
Subject: Re: Fw: [DISCUSS] Rebase and Squash Options on Github develop
I
I for one do not like revisionist history (rebase) but understand that linear
history is easier for bisect.
From: Blake Bender
Date: Monday, June 28, 2021 at 2:24 PM
To: dev@geode.apache.org
Subject: RE: Fw: [DISCUSS] Rebase and Squash Options on Github develop
+1, only because I only get one
; dev@geode.apache.org
Subject: Re: Fw: [DISCUSS] Rebase and Squash Options on Github develop
Just a clarification.
The options I am proposing to be kept in the PRs are:
* Squash and merge
* Rebase and merge
Regards,
Nabarun
From: Owen Nichols
Sent: Monday, Ju
t: Re: Fw: [DISCUSS] Rebase and Squash Options on Github develop
Just a clarification.
The options I am proposing to be kept in the PRs are:
* Squash and merge
* Rebase and merge
Regards,
Nabarun
From: Owen Nichols
Sent: Monday, June 28, 2021 1:03
] Rebase and Squash Options on Github develop
Sounds like a good idea. I can’t find any example of an intentional merge
commit on develop…but plenty of accidental ones.
Upon releases we do a command line merge commit to the main trunk, which should
still be fine as this proposal only applies to
Sounds like a good idea. I can’t find any example of an intentional merge
commit on develop…but plenty of accidental ones.
Upon releases we do a command line merge commit to the main trunk, which should
still be fine as this proposal only applies to PRs.
I agree with still allowing rebase commi
Hi all,
Last year, we had a discussion on rebase and squash merge PRs to the develop
branch,
* to have linear git history
* help with bisecting
* easier root cause analysis of failures
* easier to backport changes
However, many developers have reached out mentioning that sometim
11 matches
Mail list logo
