search

lubianat / pyorcidator

MIT License
9 stars 5 forks source link

change the project settings to enforce squash/merge and also auto-delete branches after merge #42

Closed lubianat closed 2 years ago

lubianat commented 2 years ago

@cthoyt

lubianat commented 2 years ago

any directions on how to do it?

cthoyt commented 2 years ago

Go to https://github.com/lubianat/pyorcidator/settings, scroll about 2/3 the way down, then you will see the following settings (below is the Bioregistry repo)

Screen Shot 2022-10-12 at 13 47 54
lubianat commented 2 years ago

It is set like this now: image I am not sure about the implications in practice of configuring the settings though, let me know what you'd prefer

cthoyt commented 2 years ago

Squash + merge takes all of the commits in a PR and turns them into a single commit. This lets us focus on high-level narrative in the main branch's history. This means you should un-check "merge commits" and "rebase merging"

You can also change the drop-down for squash merge to make it automatically use the PR title as the squash merge commit title (this saves time)

The rest is fine. Auto-merge is irrelevant since we haven't enforced that all commits go through PR.