Closed thomasplevy closed 3 years ago
When changes are pushed directly to the trunk branch, these changes can be automatically merged into the dev branch via a workflow.
Ideally a PR can be opened and set to merge automatically (assuming there's no merge conflicts etc...)
These actions might be useful: https://github.com/pascalgn/automerge-action and https://github.com/TreTuna/sync-branches)
Since many workflows are going to be managed in this (.github) repo and pushed other repos through the "workflow sync" workflow (which pushes to trunk) we'll more and more encounter instances of trunk and dev being out of sync
See https://github.com/gocodebox/.github/blob/trunk/.github/workflow-templates/sync-branches.yml
thomasplevy
commented
3 years ago
When changes are pushed directly to the trunk branch, these changes can be automatically merged into the dev branch via a workflow.
Ideally a PR can be opened and set to merge automatically (assuming there's no merge conflicts etc...)
These actions might be useful: https://github.com/pascalgn/automerge-action and https://github.com/TreTuna/sync-branches)
Since many workflows are going to be managed in this (.github) repo and pushed other repos through the "workflow sync" workflow (which pushes to trunk) we'll more and more encounter instances of trunk and dev being out of sync