-
Notifications
You must be signed in to change notification settings - Fork 2.6k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
KMM: changing the merge method to rebase
.
#32790
Conversation
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. Signed-off-by: Yoni Bettan <yonibettan@gmail.com>
/lgtm |
/assign @cblecker |
[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:
Approvers can indicate their approval by writing |
@ybettan: Updated the
In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
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