Description
Currently the merge handling is handled by GitHub itself, this has some drawbacks:
Proposed solution
Adopt fast forward merge strategies described in the link above and here:
https://github.com/orgs/community/discussions/4618
https://stackoverflow.com/questions/60597400/how-to-do-a-fast-forward-merge-on-github
This can be accomplished semi automated by e.g. utilizing the following workflow:
https://github.com/marketplace/actions/fast-forward-merge
There is a potential supply chain risk there. Better to copy their code to our own GitHub workflows:
https://github.com/sequoia-pgp/fast-forward/tree/main/.github/workflows
https://github.com/sequoia-pgp/fast-forward/tree/main/src
Description
Currently the merge handling is handled by GitHub itself, this has some drawbacks:
See https://blog.esciencecenter.nl/fast-forward-merges-on-github-752f900f45e8
Merge pull request X from Ycommits when git histories diverge/do not align between source and targetProposed solution
Adopt fast forward merge strategies described in the link above and here:
https://github.com/orgs/community/discussions/4618
https://stackoverflow.com/questions/60597400/how-to-do-a-fast-forward-merge-on-github
This can be accomplished semi automated by e.g. utilizing the following workflow:
https://github.com/marketplace/actions/fast-forward-merge
There is a potential supply chain risk there. Better to copy their code to our own GitHub workflows:
https://github.com/sequoia-pgp/fast-forward/tree/main/.github/workflows
https://github.com/sequoia-pgp/fast-forward/tree/main/src