+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 for one do not like
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
+1, only because I only get one vote. Merge commits in develop are a scourge,
IMO, and should be avoided in almost all instances.
Blake
-Original Message-
From: Donal Evans
Sent: Monday, June 28, 2021 2:22 PM
To: dev@geode.apache.org
Subject: Re: Fw: [DISCUSS] Rebase and Squash
I definitely approve of this proposal. I accidentally merged (rather than
squashed and merged) a PR a while back because my GitHub session had expired
and refreshing the page after trying to squash and merge resulted in the
default merge option being used, much to my frustration. I've yet to
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 PM
To: Nabarun Nag ; dev@geode.apache.org
Subject: Re: Fw: [DISCUSS]
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
> On Jun 28, 2021, at 12:38 PM, Nabarun Nag wrote:
>
>
> I would like to propose to that we set the GitHub setting on develop PR to
> rebase and squash buttons.
Does this proposal remove the option to “Rebase and Merge?
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
Hi Greg, great news! Forwarding your acceptance over to Rich and the ApacheCon
planning team. Thanks!
Anthony
> On Jun 28, 2021, at 11:19 AM, Gregory Green wrote:
>
> Hello team,
>
> I do not see where I can accept the invite in the following link/info?
>
> Dear Gregory Green,
>
Hello team,
I do not see where I can accept the invite in the following link/info?
Dear Gregory Green,
Congratulations! We are pleased to tell you that your talk, "OLTP Application
Data Services with Apache Geode”
has been accepted for ApacheCon 2021. (If you submitted additional proposals,
10 matches
Mail list logo
