AndroidAPSdocs icon indicating copy to clipboard operation
AndroidAPSdocs copied to clipboard

Change merge style to squashing

Open anbraten opened this issue 1 year ago • 3 comments

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

anbraten avatar Apr 28 '24 13:04 anbraten

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

psonnera avatar Jun 15 '24 13:06 psonnera

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.

anbraten avatar Aug 15 '24 06:08 anbraten