Rebase Tor Browser stable onto 140.7.1esr
⤵️ Rebase Stable
Bookkeeping
- Link this issue to the appropriate Release Prep issue.
Rebase
The step-by-step rebase process is detailed on the Rebase Process wiki page. Refer to it for detailed instructions on how to perform each step.
-
Rebase Tor Browser
- Prepare the rebase
- Get the Firefox tag
- Freeze the current default branch
- Create the target branch
- Do the rebase
-
Cherry-pick commits until
tor-browser-...-build1 -
Squash (
git rebase --autosquash FIREFOX_...-build1) - Cherry-pick the remaining commits
- Reorder commits
-
Cherry-pick commits until
- Merge
-
Perform a self-review (
git range-diff+ diff of diffs) - Run linters
-
Perform a self-review (
- Tag
-
tor-browser-...-build1 -
base-browser-...-build1
-
- Prepare the rebase
-
Rebase Mullvad Browser
- Prepare the rebase
-
Push the
base-browser-*tag
-
Push the
- Do the rebase
-
Cherry-pick commits until
mullvad-browser-...-build1 -
Squash (
git rebase --autosquash base-browser-...-build1) - Cherry-pick the remaining commits
- Reorder commits
-
Cherry-pick commits until
- Merge
-
Perform a self-review (
git range-diff+ diff of diffs) - Run linters
-
Perform a self-review (
- Tag
-
mullvad-browser-...-build1
-
- Prepare the rebase
Edited by ma1