Skip to content
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

Merged
merged 1 commit into from
Jun 19, 2024

Commits on Jun 19, 2024

  1. KMM: changing the merge method to rebase.

    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>
    ybettan committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    f87ba95 View commit details
    Browse the repository at this point in the history