Skip to content

Commit 07a2ca4

Browse files
Adjust contributing-admins.rst (aio-libs#12292)
1 parent 5ed2e12 commit 07a2ca4

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

docs/contributing-admins.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff 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

0 commit comments

Comments
 (0)