From d3449531aa5bcefb47cbb55ac695be5ed3dd635b Mon Sep 17 00:00:00 2001
From: Pierre Sassoulas <pierre.sassoulas@gmail.com>
Date: Sun, 9 Jan 2022 11:22:43 +0100
Subject: Bump astroid to 2.9.3, update changelog

---
 doc/release.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'doc')

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
+```
-- 
cgit v1.2.1