A PR for merging the release branch into main (e.g. PR #32).
A PR for merging the release branch into develop (e.g. PR #31).
I really like this approach because it clearly tells you both what changes have happened since the last release and (separately) what changes were needed to publish this release. However, note that since GitHub will create a separate merge commit for each PR, this will cause the develop and master branches to no longer be able to fast-forward to each other.
A simple approach might be:
A PR for merging the release branch into main (e.g. PR #32).
Once this PR has been merged, the person making the release should manually sync develop and main by running:
$ git checkout main
$ git pull origin main
$ git checkout develop
$ git pull origin develop
$ git merge main # Fix any merge conflicts, although really shouldn't be any.
$ git push origin develop
What do you all think? Once we decide on the right approach, we should update CONTRIBUTING.md with those instructions before closing this issue.
We currently document the release process as using Git Flow (https://github.com/cancerDHC/sheet2linkml/blob/develop/CONTRIBUTING.md#release-process). In the future, however, we would prefer to do this using GitHub PRs, with:
main(e.g. PR #32).develop(e.g. PR #31).I really like this approach because it clearly tells you both what changes have happened since the last release and (separately) what changes were needed to publish this release. However, note that since GitHub will create a separate merge commit for each PR, this will cause the develop and master branches to no longer be able to fast-forward to each other.
A simple approach might be:
main(e.g. PR #32).What do you all think? Once we decide on the right approach, we should update CONTRIBUTING.md with those instructions before closing this issue.