search

kubernetes / test-infra

Test infrastructure for the Kubernetes project.
Apache License 2.0
3.81k stars 2.61k forks source link

KMM: changing the merge method to `rebase`. #32790

Closed ybettan closed 3 weeks ago

ybettan commented 3 weeks ago

When publishing a new release, multiple commits are going to be cherry-picked from the main branch.

With the previous squash merge method, all those commits would squash to a single huge commit message which is difficult to follow, blame and polluted with multiple signatures.

With this change, we should get a much cleaner git history.

In order to mitigate the risk that comes with the rebase merge methods, we have a CI job that validates that each PR contain a single commit to ensure we don't merge multiple "garbage" commits for a single change in a PR.

--

/cc @qbarrand

qbarrand commented 3 weeks ago

/lgtm

ybettan commented 3 weeks ago

/assign @cblecker

k8s-ci-robot commented 3 weeks ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cblecker, ybettan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files: - ~~[config/OWNERS](https://github.com/kubernetes/test-infra/blob/master/config/OWNERS)~~ [cblecker] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
k8s-ci-robot commented 3 weeks ago

@ybettan: Updated the config configmap in namespace default at cluster test-infra-trusted using the following files:

In response to [this](https://github.com/kubernetes/test-infra/pull/32790): >When publishing a new release, multiple commits are going to be cherry-picked from the main branch. > >With the previous `squash` merge method, all those commits would squash to a single huge commit message which is difficult to follow, blame and polluted with multiple signatures. > >With this change, we should get a much cleaner git history. > >In order to mitigate the risk that comes with the `rebase` merge methods, we have a CI job that validates that each PR contain a single commit to ensure we don't merge multiple "garbage" commits for a single change in a PR. > >-- > >/cc @qbarrand Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.