You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@hop.apache.org by Hans Van Akelyen <ha...@gmail.com> on 2025/09/29 09:27:36 UTC
[Discuss] disable Merge commit on PRs
Hi All,
I would like to propose to disable/remove the option to do a merge commit on GitHub Pull Requests and only allow Squash and merge.
Upside:
My personal opinion is that this gives a cleaner commit history, the Additional merge commits clutter the history and do not add much value as each ticket and feature is best handled in a single commit.
Downside:
As this is a squash each ticket will need to have a separate branch/PR. I know some of us (including myself) use a single branch to handle multiple tickets and create separate commits for each ticket number. This would result in all those commits getting squashed together making it harder to know which code was touched for each ticket.
To see the difference on our history you can take a look at our commit history [1]. Sep 25 were merge commits and 29th were squash rebase
Would love to hear opinions and personal preferences.
Cheers,
Hans
[1] https://github.com/apache/hop/commits/main/
Re: [Discuss] disable Merge commit on PRs
Posted by Hans Van Akelyen <ha...@gmail.com>.
Hi All,
As there are no objections I will move forward and change the settings of our repository to only do squash and merge.
Cheers,
Hans
On 29 Sep 2025 at 12:19 +0200, Matt Casters (i-Bridge) <ma...@ibridge.be>, wrote:
> I also completely agree. Especially for the larger development efforts it's
> really better to squash commit history.
>
> Thanks!
>
> Matt
>
>
> Op ma 29 sep 2025, 11:51 schreef Francois Papon <
> francois.papon@openobject.fr>:
>
> > Hi,
> >
> > Big +1 to force squash, it's better for history.
> >
> > regards,
> >
> > François
> > fpapon@apache.org
> > francois.papon@openobject.fr
> >
> > Le 29/09/2025 à 11:27, Hans Van Akelyen a écrit :
> > > > Hi All,
> > > >
> > > > I would like to propose to disable/remove the option to do a merge
> > commit on GitHub Pull Requests and only allow Squash and merge.
> > > >
> > > > Upside:
> > > > My personal opinion is that this gives a cleaner commit history, the
> > Additional merge commits clutter the history and do not add much value as
> > each ticket and feature is best handled in a single commit.
> > > >
> > > > Downside:
> > > > As this is a squash each ticket will need to have a separate branch/PR.
> > I know some of us (including myself) use a single branch to handle multiple
> > tickets and create separate commits for each ticket number. This would
> > result in all those commits getting squashed together making it harder to
> > know which code was touched for each ticket.
> > > >
> > > > To see the difference on our history you can take a look at our commit
> > history [1]. Sep 25 were merge commits and 29th were squash rebase
> > > >
> > > > Would love to hear opinions and personal preferences.
> > > >
> > > > Cheers,
> > > > Hans
> > > >
> > > > [1] https://github.com/apache/hop/commits/main/
> > > >
> > > >
> > > >
> >
Re: [Discuss] disable Merge commit on PRs
Posted by "Matt Casters (i-Bridge)" <ma...@ibridge.be>.
I also completely agree. Especially for the larger development efforts it's
really better to squash commit history.
Thanks!
Matt
Op ma 29 sep 2025, 11:51 schreef Francois Papon <
francois.papon@openobject.fr>:
> Hi,
>
> Big +1 to force squash, it's better for history.
>
> regards,
>
> François
> fpapon@apache.org
> francois.papon@openobject.fr
>
> Le 29/09/2025 à 11:27, Hans Van Akelyen a écrit :
> > Hi All,
> >
> > I would like to propose to disable/remove the option to do a merge
> commit on GitHub Pull Requests and only allow Squash and merge.
> >
> > Upside:
> > My personal opinion is that this gives a cleaner commit history, the
> Additional merge commits clutter the history and do not add much value as
> each ticket and feature is best handled in a single commit.
> >
> > Downside:
> > As this is a squash each ticket will need to have a separate branch/PR.
> I know some of us (including myself) use a single branch to handle multiple
> tickets and create separate commits for each ticket number. This would
> result in all those commits getting squashed together making it harder to
> know which code was touched for each ticket.
> >
> > To see the difference on our history you can take a look at our commit
> history [1]. Sep 25 were merge commits and 29th were squash rebase
> >
> > Would love to hear opinions and personal preferences.
> >
> > Cheers,
> > Hans
> >
> > [1] https://github.com/apache/hop/commits/main/
> >
> >
> >
>
Re: [Discuss] disable Merge commit on PRs
Posted by Francois Papon <fr...@openobject.fr>.
Hi,
Big +1 to force squash, it's better for history.
regards,
François
fpapon@apache.org
francois.papon@openobject.fr
Le 29/09/2025 à 11:27, Hans Van Akelyen a écrit :
> Hi All,
>
> I would like to propose to disable/remove the option to do a merge commit on GitHub Pull Requests and only allow Squash and merge.
>
> Upside:
> My personal opinion is that this gives a cleaner commit history, the Additional merge commits clutter the history and do not add much value as each ticket and feature is best handled in a single commit.
>
> Downside:
> As this is a squash each ticket will need to have a separate branch/PR. I know some of us (including myself) use a single branch to handle multiple tickets and create separate commits for each ticket number. This would result in all those commits getting squashed together making it harder to know which code was touched for each ticket.
>
> To see the difference on our history you can take a look at our commit history [1]. Sep 25 were merge commits and 29th were squash rebase
>
> Would love to hear opinions and personal preferences.
>
> Cheers,
> Hans
>
> [1] https://github.com/apache/hop/commits/main/
>
>
>