File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -35,9 +35,10 @@ first merge into the newer release branch (e.g. 3.8 into 3.9) and then to master
3535#. Switch to target branch: e.g. ``git checkout 3.9 && git pull ``
3636#. Start a merge: e.g. ``git merge 3.8 --no-commit --no-ff --gpg-sign ``
3737#. Carefully review the changes and revert anything that should not be included (most
38- things outside the changelog).
38+ things outside the changelog). Use `git checkout 3.9 path/to/file ` to revert files
39+ without aborting the merge.
3940#. To ensure change fragments are cleaned up properly, run: ``python tools/cleanup_changes.py ``
40- #. Commit the merge (must be a normal merge commit, not squashed) .
41+ #. Complete the merge: ` git merge --continue ` .
4142#. Push the branch directly to Github (because a PR would get squashed). When pushing,
4243 you may get a rejected message. Follow these steps to resolve:
4344
You can’t perform that action at this time.
0 commit comments