summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorPierre Sassoulas <pierre.sassoulas@gmail.com>2022-01-09 11:22:43 +0100
committerPierre Sassoulas <pierre.sassoulas@gmail.com>2022-01-09 11:24:10 +0100
commitd3449531aa5bcefb47cbb55ac695be5ed3dd635b (patch)
treec8131cb25d5a32008bd0eb13621b78052f60bb3e /doc
parenta03c07d835d138086160fa2452b7b7297f41ed9b (diff)
downloadastroid-git-d3449531aa5bcefb47cbb55ac695be5ed3dd635b.tar.gz
Bump astroid to 2.9.3, update changelogv2.9.3
Diffstat (limited to 'doc')
-rw-r--r--doc/release.md14
1 files changed, 14 insertions, 0 deletions
diff --git a/doc/release.md b/doc/release.md
index a595207d..96855ef3 100644
--- a/doc/release.md
+++ b/doc/release.md
@@ -29,3 +29,17 @@ Check the result and then upgrade the main branch
We move issue that were not done in the next milestone and block release only if it's an
issue labelled as blocker.
+
+## Post release
+
+### Merge tags in main for pre-commit
+
+If the tag you just made is not part of the main branch, merge the tag `vX.Y.Z` in the
+main branch by doing a history only merge. It's done in order to signal that this is an
+official release tag, and for `pre-commit autoupdate` to works.
+
+```bash
+git checkout main
+git merge --no-edit --strategy=ours vX.Y.Z
+git push
+```