forked from getredash/redash
-
Notifications
You must be signed in to change notification settings - Fork 21
Rebase workflow
Jannis Leidel edited this page May 13, 2019
·
2 revisions
This describes the high-level workflow to rebase our Redash fork on top of the recent master of upstream Redash.
- Fetch remote from upstream
- Create tracking branch mXX-rebase from upstream master
- Fetch latest changes from mozilla master
- Open list of commits in mozilla master in browser
- Look for last commit that wasn’t one of the upstream commits
- Cherry-pick commits individually, when needed (e.g. feature may have been ported or become moot)
- Keep notes which commits have been applied, applied with extra TODOs (e.g. let OPs do something), dropped or dropped but with extra TODOs
- Review all applied commits and see if any can be collapsed.
- Collapse commits by rebasing interactively on top of upstream master.
- Note collapsed commits in notes.
- Review TODOs and open follow-up tickets.
- Push mXX-rebase branch to fork repo.
- Open PR between mXX-rebase and release branches in fork repo with notes as PR description.
- Ask peers to do rebase review.
- Fix issues if needed.
- Collapse fixes again if needed.
- Force push mXX-rebase branch to release branch.
- Review rc environment.