doc: clarify PR merge strategies in contrib guide

SysBioChalmers / GECKO

Toolbox for including enzyme constraints on a genome-scale model.

http://sysbiochalmers.github.io/GECKO/

MIT License

67 stars 50 forks source link

doc: clarify PR merge strategies in contrib guide #341

Closed edkerk closed 1 year ago

edkerk commented 1 year ago

Main improvements in this PR:

Documentation:
- Clarify PR merging strategies to develop (squash-merge) and main (merge commit) in Contributor guidelines.
- Change PR template to nudge towards using the correct PR merging strategy.
- Instruct in Contributor guidelines to increment version.txt with each release.

I hereby confirm that I have:

[x] Selected develop as a target branch (top left drop-down menu)

github-actions[bot] commented 1 year ago

This PR has been automatically tested with GH Actions. Here is the output of the tests:

 
Running geckoCoreFunctionTests
Done geckoCoreFunctionTests
__________

Note: In the case of multiple test runs, this post will be edited.

edkerk commented 1 year ago

Clear directions NOT to use "Squash and merge" between develop and main should prevent confusing PRs like #340, which contains many commits that were already included in the previous release as well.