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

Change merge style to squashing #2013

Open
anbraten opened this issue Apr 28, 2024 · 2 comments
Open

Change merge style to squashing #2013

anbraten opened this issue Apr 28, 2024 · 2 comments

Comments

@anbraten
Copy link
Contributor

anbraten commented Apr 28, 2024

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

@psonnera
Copy link
Collaborator

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

@anbraten
Copy link
Contributor Author

anbraten commented Aug 15, 2024

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants