Skip to content

Change merge style to squashing #2013

Open

Description

@anbraten

The repository currently has a lot of commits as all changes to a pull-request are merged into master as well. Instead I would suggest to enable squashing only in the settings as shown below. To combine all commits from a pull-request into a single commit having the title of the pull-request as commit message.

https://github.com/openaps/AndroidAPSdocs/settings

image

Activity

  1. psonnera commented on Jun 15, 2024

    @psonnera
    Collaborator

    Looking at it now, just wonder if it won't be counter productive to cherry picking modifications when merging...

  2. anbraten commented on Aug 15, 2024

    @anbraten
    ContributorAuthor

    I actually think it would help a lot to get a cleaner commit list of the master branch helping to revert, check commits. We should probably do separate pull-request if they contain multiple unrelated changes.

    Using squashing would provide all "non-technical" contributors the ability to simply do changes to their pull-request til they are happy without caring about the commit history / names lowering the barrier with git and they wouldn't need to care about rebasing etc at all.

  3. psonnera commented on Oct 26, 2025

    @psonnera
    Collaborator

    @MilosKozak can you change that setting, it does make sense for Crowdin translations PRs that are invading the list of commits hence drowning other PRs. Thanks.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

Labels

enhancementNew feature or request

Type

No type

Projects

No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions