patcon
commented
2 hours ago Or maybe using these, because we don't need PRs, and I think PRs would rewrite commit history, rather than just push with fast-forward merge style.
- https://github.com/actions/checkout (checkout upstream)
- manually
git remote set-url origin <our remote> - https://github.com/marketplace/actions/merge-fast-forward-only
EDIT: On third thought, I think this is the approach:
- https://github.com/actions/checkout (checkout upstream)
- manually
git remote set-url origin <our remote> - https://github.com/ad-m/github-push-action
Re-ticketed from https://github.com/CivicTechTO/polis/issues/50#issuecomment-2429889844
We've now protected the
edgebranch so that it's read-only, and can only be updated by clicking the "sync fork" button from upstream. We can make this happen automatically, so it's always up-to-date with them:https://github.com/marketplace/actions/fork-sync