The PR template now clarifies that squash-merge should be used for merges to develop, while merges to main should be resolved as merge commit. The checkboxes help to remember this, but the actual choice of merge type can only be selected when the actual merge is made. The reason for using squash-merge to develop is to somewhat reduce the clutter in the repository's git history.
I hereby confirm that I have:
[ ] Any removed reactions and metabolites have been moved to the corresponding deprecated identifier lists in data/deprecatedIdentifiers/.
[X] This PR has develop as target branch, and will be resolved with a squash-merge.
[ ] This PR has main as target branch, and will be resolved with a merge commit.
Main improvements in this PR:
The PR template now clarifies that squash-merge should be used for merges to
develop
, while merges tomain
should be resolved as merge commit. The checkboxes help to remember this, but the actual choice of merge type can only be selected when the actual merge is made. The reason for using squash-merge todevelop
is to somewhat reduce the clutter in the repository's git history.I hereby confirm that I have:
data/deprecatedIdentifiers/
.develop
as target branch, and will be resolved with a squash-merge.main
as target branch, and will be resolved with a merge commit.