You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@ofbiz.apache.org by Jacopo Cappellato <ja...@gmail.com> on 2026/03/11 15:17:04 UTC
Proposal: Allow "Rebase and Merge" in GitHub branch protection rules
Hi all,
Currently, the GitHub branch protection rules for our repositories
(ofbiz-framework, ofbiz-plugins, ofbiz-site, ofbiz-tools) enforce a
linear history, which is a good practice that helps keep the commit
history clean and easy to follow.
I would like to propose a small refinement to these settings: allowing
"Rebase and Merge" as an additional merge option for pull requests,
alongside the currently used "Squash and merge".
With this configuration, we would still enforce the constraint of a
linear history, but committers reviewing pull requests would have the
flexibility to choose between two approaches:
* Squash and merge: combine all commits in the pull request into a
single commit.
* Rebase and Merge: rebase the commits from the pull request and add
them individually to the main branch.
The idea is that the choice would depend on the quality of the commit
messages in the pull request:
* If the commits already contain clear, well-structured messages that
comply with the OFBiz guidelines, the committer could use Rebase and
Merge to preserve them.
* If the commit messages are not compliant with our guidelines or are
not particularly useful, the committer could use Squash and merge and
provide a new commit message that follows our conventions.
This approach would allow us to maintain a linear and readable history
while also preserving high-quality commit histories when they are
provided.
Please share your thoughts on this proposal.
Best regards,
Jacopo
Re: Proposal: Allow "Rebase and Merge" in GitHub branch protection rules
Posted by "gil.portenseigne" <gi...@nereide.fr>.
Hi,
+1, good commits separation are part of the contribution that should be
kept.
Thanks
Gil
Le 11/03/26 04:17, Jacopo Cappellato a écrit :
> Hi all,
>
> Currently, the GitHub branch protection rules for our repositories
> (ofbiz-framework, ofbiz-plugins, ofbiz-site, ofbiz-tools) enforce a
> linear history, which is a good practice that helps keep the commit
> history clean and easy to follow.
>
> I would like to propose a small refinement to these settings: allowing
> "Rebase and Merge" as an additional merge option for pull requests,
> alongside the currently used "Squash and merge".
>
> With this configuration, we would still enforce the constraint of a
> linear history, but committers reviewing pull requests would have the
> flexibility to choose between two approaches:
> * Squash and merge: combine all commits in the pull request into a
> single commit.
> * Rebase and Merge: rebase the commits from the pull request and add
> them individually to the main branch.
>
> The idea is that the choice would depend on the quality of the commit
> messages in the pull request:
>
> * If the commits already contain clear, well-structured messages that
> comply with the OFBiz guidelines, the committer could use Rebase and
> Merge to preserve them.
> * If the commit messages are not compliant with our guidelines or are
> not particularly useful, the committer could use Squash and merge and
> provide a new commit message that follows our conventions.
>
> This approach would allow us to maintain a linear and readable history
> while also preserving high-quality commit histories when they are
> provided.
>
> Please share your thoughts on this proposal.
>
> Best regards,
> Jacopo
Re: Proposal: Allow "Rebase and Merge" in GitHub branch protection rules
Posted by Chandan Khandelwal <ch...@hotwaxsystems.com>.
+1
Allowing both options while keeping linear history looks good.
Kind Regards,
Chandan Khandelwal
On Fri, Mar 13, 2026 at 4:02 PM Jacopo Cappellato <
jacopo.cappellato@gmail.com> wrote:
> For your reference, this is the ticket:
>
> https://issues.apache.org/jira/browse/INFRA-27732
>
> Jacopo
>
>
> On Fri, Mar 13, 2026 at 11:26 AM Jacopo Cappellato <
> jacopo.cappellato@gmail.com> wrote:
>
> > Thank you for your feedback.
> > Since there are no objections and we have received enough positive
> > feedback (9 contributors, including 7 PMC members), I will proceed with
> > filing the ticket with Infra and will use this thread as a reference.
> >
> > Regards,
> > Jacopo
> >
> > On Wed, Mar 11, 2026 at 4:17 PM Jacopo Cappellato <
> > jacopo.cappellato@gmail.com> wrote:
> >
> >> Hi all,
> >>
> >> Currently, the GitHub branch protection rules for our repositories
> >> (ofbiz-framework, ofbiz-plugins, ofbiz-site, ofbiz-tools) enforce a
> >> linear history, which is a good practice that helps keep the commit
> >> history clean and easy to follow.
> >>
> >> I would like to propose a small refinement to these settings: allowing
> >> "Rebase and Merge" as an additional merge option for pull requests,
> >> alongside the currently used "Squash and merge".
> >>
> >> With this configuration, we would still enforce the constraint of a
> >> linear history, but committers reviewing pull requests would have the
> >> flexibility to choose between two approaches:
> >> * Squash and merge: combine all commits in the pull request into a
> >> single commit.
> >> * Rebase and Merge: rebase the commits from the pull request and add
> >> them individually to the main branch.
> >>
> >> The idea is that the choice would depend on the quality of the commit
> >> messages in the pull request:
> >>
> >> * If the commits already contain clear, well-structured messages that
> >> comply with the OFBiz guidelines, the committer could use Rebase and
> >> Merge to preserve them.
> >> * If the commit messages are not compliant with our guidelines or are
> >> not particularly useful, the committer could use Squash and merge and
> >> provide a new commit message that follows our conventions.
> >>
> >> This approach would allow us to maintain a linear and readable history
> >> while also preserving high-quality commit histories when they are
> >> provided.
> >>
> >> Please share your thoughts on this proposal.
> >>
> >> Best regards,
> >> Jacopo
> >>
> >
>
Re: Proposal: Allow "Rebase and Merge" in GitHub branch protection rules
Posted by Jacopo Cappellato <ja...@gmail.com>.
For your reference, this is the ticket:
https://issues.apache.org/jira/browse/INFRA-27732
Jacopo
On Fri, Mar 13, 2026 at 11:26 AM Jacopo Cappellato <
jacopo.cappellato@gmail.com> wrote:
> Thank you for your feedback.
> Since there are no objections and we have received enough positive
> feedback (9 contributors, including 7 PMC members), I will proceed with
> filing the ticket with Infra and will use this thread as a reference.
>
> Regards,
> Jacopo
>
> On Wed, Mar 11, 2026 at 4:17 PM Jacopo Cappellato <
> jacopo.cappellato@gmail.com> wrote:
>
>> Hi all,
>>
>> Currently, the GitHub branch protection rules for our repositories
>> (ofbiz-framework, ofbiz-plugins, ofbiz-site, ofbiz-tools) enforce a
>> linear history, which is a good practice that helps keep the commit
>> history clean and easy to follow.
>>
>> I would like to propose a small refinement to these settings: allowing
>> "Rebase and Merge" as an additional merge option for pull requests,
>> alongside the currently used "Squash and merge".
>>
>> With this configuration, we would still enforce the constraint of a
>> linear history, but committers reviewing pull requests would have the
>> flexibility to choose between two approaches:
>> * Squash and merge: combine all commits in the pull request into a
>> single commit.
>> * Rebase and Merge: rebase the commits from the pull request and add
>> them individually to the main branch.
>>
>> The idea is that the choice would depend on the quality of the commit
>> messages in the pull request:
>>
>> * If the commits already contain clear, well-structured messages that
>> comply with the OFBiz guidelines, the committer could use Rebase and
>> Merge to preserve them.
>> * If the commit messages are not compliant with our guidelines or are
>> not particularly useful, the committer could use Squash and merge and
>> provide a new commit message that follows our conventions.
>>
>> This approach would allow us to maintain a linear and readable history
>> while also preserving high-quality commit histories when they are
>> provided.
>>
>> Please share your thoughts on this proposal.
>>
>> Best regards,
>> Jacopo
>>
>
Re: Proposal: Allow "Rebase and Merge" in GitHub branch protection rules
Posted by Jacopo Cappellato <ja...@gmail.com>.
Thank you for your feedback.
Since there are no objections and we have received enough positive feedback
(9 contributors, including 7 PMC members), I will proceed with filing the
ticket with Infra and will use this thread as a reference.
Regards,
Jacopo
On Wed, Mar 11, 2026 at 4:17 PM Jacopo Cappellato <
jacopo.cappellato@gmail.com> wrote:
> Hi all,
>
> Currently, the GitHub branch protection rules for our repositories
> (ofbiz-framework, ofbiz-plugins, ofbiz-site, ofbiz-tools) enforce a
> linear history, which is a good practice that helps keep the commit
> history clean and easy to follow.
>
> I would like to propose a small refinement to these settings: allowing
> "Rebase and Merge" as an additional merge option for pull requests,
> alongside the currently used "Squash and merge".
>
> With this configuration, we would still enforce the constraint of a
> linear history, but committers reviewing pull requests would have the
> flexibility to choose between two approaches:
> * Squash and merge: combine all commits in the pull request into a
> single commit.
> * Rebase and Merge: rebase the commits from the pull request and add
> them individually to the main branch.
>
> The idea is that the choice would depend on the quality of the commit
> messages in the pull request:
>
> * If the commits already contain clear, well-structured messages that
> comply with the OFBiz guidelines, the committer could use Rebase and
> Merge to preserve them.
> * If the commit messages are not compliant with our guidelines or are
> not particularly useful, the committer could use Squash and merge and
> provide a new commit message that follows our conventions.
>
> This approach would allow us to maintain a linear and readable history
> while also preserving high-quality commit histories when they are
> provided.
>
> Please share your thoughts on this proposal.
>
> Best regards,
> Jacopo
>
Re: Proposal: Allow "Rebase and Merge" in GitHub branch protection rules
Posted by Pranay Pandey <pr...@noitechnologies.com>.
Hi Jacopo,
+1
I agree that this is a good approach, and I think we should move forward
with it. Thanks!
Best regards,
Pranay Pandey
On Thu, 12 Mar 2026 at 14:43, Michael Brohl <mi...@ecomify.de>
wrote:
> Hi Jacopo,
>
> that sound reasonable to me, thank you!
>
> Best regards,
>
> Michael Brohl
>
> ecomify GmbH - www.ecomify.de
>
>
> Am 11.03.26 um 16:17 schrieb Jacopo Cappellato:
> > Hi all,
> >
> > Currently, the GitHub branch protection rules for our repositories
> > (ofbiz-framework, ofbiz-plugins, ofbiz-site, ofbiz-tools) enforce a
> > linear history, which is a good practice that helps keep the commit
> > history clean and easy to follow.
> >
> > I would like to propose a small refinement to these settings: allowing
> > "Rebase and Merge" as an additional merge option for pull requests,
> > alongside the currently used "Squash and merge".
> >
> > With this configuration, we would still enforce the constraint of a
> > linear history, but committers reviewing pull requests would have the
> > flexibility to choose between two approaches:
> > * Squash and merge: combine all commits in the pull request into a
> > single commit.
> > * Rebase and Merge: rebase the commits from the pull request and add
> > them individually to the main branch.
> >
> > The idea is that the choice would depend on the quality of the commit
> > messages in the pull request:
> >
> > * If the commits already contain clear, well-structured messages that
> > comply with the OFBiz guidelines, the committer could use Rebase and
> > Merge to preserve them.
> > * If the commit messages are not compliant with our guidelines or are
> > not particularly useful, the committer could use Squash and merge and
> > provide a new commit message that follows our conventions.
> >
> > This approach would allow us to maintain a linear and readable history
> > while also preserving high-quality commit histories when they are
> > provided.
> >
> > Please share your thoughts on this proposal.
> >
> > Best regards,
> > Jacopo
>
Re: Proposal: Allow "Rebase and Merge" in GitHub branch protection rules
Posted by Michael Brohl <mi...@ecomify.de>.
Hi Jacopo,
that sound reasonable to me, thank you!
Best regards,
Michael Brohl
ecomify GmbH - www.ecomify.de
Am 11.03.26 um 16:17 schrieb Jacopo Cappellato:
> Hi all,
>
> Currently, the GitHub branch protection rules for our repositories
> (ofbiz-framework, ofbiz-plugins, ofbiz-site, ofbiz-tools) enforce a
> linear history, which is a good practice that helps keep the commit
> history clean and easy to follow.
>
> I would like to propose a small refinement to these settings: allowing
> "Rebase and Merge" as an additional merge option for pull requests,
> alongside the currently used "Squash and merge".
>
> With this configuration, we would still enforce the constraint of a
> linear history, but committers reviewing pull requests would have the
> flexibility to choose between two approaches:
> * Squash and merge: combine all commits in the pull request into a
> single commit.
> * Rebase and Merge: rebase the commits from the pull request and add
> them individually to the main branch.
>
> The idea is that the choice would depend on the quality of the commit
> messages in the pull request:
>
> * If the commits already contain clear, well-structured messages that
> comply with the OFBiz guidelines, the committer could use Rebase and
> Merge to preserve them.
> * If the commit messages are not compliant with our guidelines or are
> not particularly useful, the committer could use Squash and merge and
> provide a new commit message that follows our conventions.
>
> This approach would allow us to maintain a linear and readable history
> while also preserving high-quality commit histories when they are
> provided.
>
> Please share your thoughts on this proposal.
>
> Best regards,
> Jacopo
Re: Proposal: Allow "Rebase and Merge" in GitHub branch protection rules
Posted by Jacques Le Roux via dev <de...@ofbiz.apache.org>.
Hi Jacopo,
I see no problems with that. If issues happen we can revert this new protection rule.
Jacques
Le 11/03/2026 à 16:17, Jacopo Cappellato a écrit :
> Hi all,
>
> Currently, the GitHub branch protection rules for our repositories
> (ofbiz-framework, ofbiz-plugins, ofbiz-site, ofbiz-tools) enforce a
> linear history, which is a good practice that helps keep the commit
> history clean and easy to follow.
>
> I would like to propose a small refinement to these settings: allowing
> "Rebase and Merge" as an additional merge option for pull requests,
> alongside the currently used "Squash and merge".
>
> With this configuration, we would still enforce the constraint of a
> linear history, but committers reviewing pull requests would have the
> flexibility to choose between two approaches:
> * Squash and merge: combine all commits in the pull request into a
> single commit.
> * Rebase and Merge: rebase the commits from the pull request and add
> them individually to the main branch.
>
> The idea is that the choice would depend on the quality of the commit
> messages in the pull request:
>
> * If the commits already contain clear, well-structured messages that
> comply with the OFBiz guidelines, the committer could use Rebase and
> Merge to preserve them.
> * If the commit messages are not compliant with our guidelines or are
> not particularly useful, the committer could use Squash and merge and
> provide a new commit message that follows our conventions.
>
> This approach would allow us to maintain a linear and readable history
> while also preserving high-quality commit histories when they are
> provided.
>
> Please share your thoughts on this proposal.
>
> Best regards,
> Jacopo
Re: Proposal: Allow "Rebase and Merge" in GitHub branch protection rules
Posted by Arun Patidar <ar...@hotwax.co>.
+1
Thanks
---
Arun Patidar
On Thu, Mar 12, 2026 at 9:47 AM Divesh Dutta <di...@hotwaxsystems.com>
wrote:
> Hi Jacopo,
>
> I like this new refinement.
>
> Thanks
> --
> Divesh Dutta
> www.hotwaxsystems.com
>
> On Wed, Mar 11, 2026 at 8:47 PM Jacopo Cappellato <
> jacopo.cappellato@gmail.com> wrote:
>
> > Hi all,
> >
> > Currently, the GitHub branch protection rules for our repositories
> > (ofbiz-framework, ofbiz-plugins, ofbiz-site, ofbiz-tools) enforce a
> > linear history, which is a good practice that helps keep the commit
> > history clean and easy to follow.
> >
> > I would like to propose a small refinement to these settings: allowing
> > "Rebase and Merge" as an additional merge option for pull requests,
> > alongside the currently used "Squash and merge".
> >
> > With this configuration, we would still enforce the constraint of a
> > linear history, but committers reviewing pull requests would have the
> > flexibility to choose between two approaches:
> > * Squash and merge: combine all commits in the pull request into a
> > single commit.
> > * Rebase and Merge: rebase the commits from the pull request and add
> > them individually to the main branch.
> >
> > The idea is that the choice would depend on the quality of the commit
> > messages in the pull request:
> >
> > * If the commits already contain clear, well-structured messages that
> > comply with the OFBiz guidelines, the committer could use Rebase and
> > Merge to preserve them.
> > * If the commit messages are not compliant with our guidelines or are
> > not particularly useful, the committer could use Squash and merge and
> > provide a new commit message that follows our conventions.
> >
> > This approach would allow us to maintain a linear and readable history
> > while also preserving high-quality commit histories when they are
> > provided.
> >
> > Please share your thoughts on this proposal.
> >
> > Best regards,
> > Jacopo
> >
>
Re: Proposal: Allow "Rebase and Merge" in GitHub branch protection rules
Posted by Divesh Dutta <di...@hotwaxsystems.com>.
Hi Jacopo,
I like this new refinement.
Thanks
--
Divesh Dutta
www.hotwaxsystems.com
On Wed, Mar 11, 2026 at 8:47 PM Jacopo Cappellato <
jacopo.cappellato@gmail.com> wrote:
> Hi all,
>
> Currently, the GitHub branch protection rules for our repositories
> (ofbiz-framework, ofbiz-plugins, ofbiz-site, ofbiz-tools) enforce a
> linear history, which is a good practice that helps keep the commit
> history clean and easy to follow.
>
> I would like to propose a small refinement to these settings: allowing
> "Rebase and Merge" as an additional merge option for pull requests,
> alongside the currently used "Squash and merge".
>
> With this configuration, we would still enforce the constraint of a
> linear history, but committers reviewing pull requests would have the
> flexibility to choose between two approaches:
> * Squash and merge: combine all commits in the pull request into a
> single commit.
> * Rebase and Merge: rebase the commits from the pull request and add
> them individually to the main branch.
>
> The idea is that the choice would depend on the quality of the commit
> messages in the pull request:
>
> * If the commits already contain clear, well-structured messages that
> comply with the OFBiz guidelines, the committer could use Rebase and
> Merge to preserve them.
> * If the commit messages are not compliant with our guidelines or are
> not particularly useful, the committer could use Squash and merge and
> provide a new commit message that follows our conventions.
>
> This approach would allow us to maintain a linear and readable history
> while also preserving high-quality commit histories when they are
> provided.
>
> Please share your thoughts on this proposal.
>
> Best regards,
> Jacopo
>
Re: Proposal: Allow "Rebase and Merge" in GitHub branch protection rules
Posted by Anahita Goljahani <an...@gmail.com>.
+1
Thank you
Anahita
Il giorno mer 11 mar 2026 alle ore 16:18 Jacopo Cappellato
<ja...@gmail.com> ha scritto:
>
> Hi all,
>
> Currently, the GitHub branch protection rules for our repositories
> (ofbiz-framework, ofbiz-plugins, ofbiz-site, ofbiz-tools) enforce a
> linear history, which is a good practice that helps keep the commit
> history clean and easy to follow.
>
> I would like to propose a small refinement to these settings: allowing
> "Rebase and Merge" as an additional merge option for pull requests,
> alongside the currently used "Squash and merge".
>
> With this configuration, we would still enforce the constraint of a
> linear history, but committers reviewing pull requests would have the
> flexibility to choose between two approaches:
> * Squash and merge: combine all commits in the pull request into a
> single commit.
> * Rebase and Merge: rebase the commits from the pull request and add
> them individually to the main branch.
>
> The idea is that the choice would depend on the quality of the commit
> messages in the pull request:
>
> * If the commits already contain clear, well-structured messages that
> comply with the OFBiz guidelines, the committer could use Rebase and
> Merge to preserve them.
> * If the commit messages are not compliant with our guidelines or are
> not particularly useful, the committer could use Squash and merge and
> provide a new commit message that follows our conventions.
>
> This approach would allow us to maintain a linear and readable history
> while also preserving high-quality commit histories when they are
> provided.
>
> Please share your thoughts on this proposal.
>
> Best regards,
> Jacopo
Re: Proposal: Allow "Rebase and Merge" in GitHub branch protection rules
Posted by Ashish Vijaywargiya <as...@hotwaxsystems.com>.
+1
--
Kind Regards,
Ashish Vijaywargiya
Vice President of Operations
*HotWax Systems*
*Enterprise open source experts*
http://www.hotwaxsystems.com
On Wed, Mar 11, 2026 at 8:48 PM Jacopo Cappellato <
jacopo.cappellato@gmail.com> wrote:
> Hi all,
>
> Currently, the GitHub branch protection rules for our repositories
> (ofbiz-framework, ofbiz-plugins, ofbiz-site, ofbiz-tools) enforce a
> linear history, which is a good practice that helps keep the commit
> history clean and easy to follow.
>
> I would like to propose a small refinement to these settings: allowing
> "Rebase and Merge" as an additional merge option for pull requests,
> alongside the currently used "Squash and merge".
>
> With this configuration, we would still enforce the constraint of a
> linear history, but committers reviewing pull requests would have the
> flexibility to choose between two approaches:
> * Squash and merge: combine all commits in the pull request into a
> single commit.
> * Rebase and Merge: rebase the commits from the pull request and add
> them individually to the main branch.
>
> The idea is that the choice would depend on the quality of the commit
> messages in the pull request:
>
> * If the commits already contain clear, well-structured messages that
> comply with the OFBiz guidelines, the committer could use Rebase and
> Merge to preserve them.
> * If the commit messages are not compliant with our guidelines or are
> not particularly useful, the committer could use Squash and merge and
> provide a new commit message that follows our conventions.
>
> This approach would allow us to maintain a linear and readable history
> while also preserving high-quality commit histories when they are
> provided.
>
> Please share your thoughts on this proposal.
>
> Best regards,
> Jacopo
>