summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Sassoulas <pierre.sassoulas@gmail.com>2021-03-21 18:45:17 +0100
committerPierre Sassoulas <pierre.sassoulas@gmail.com>2021-03-28 22:48:56 +0200
commit005e0c73d5b71f98254130b46f453c91590a22c4 (patch)
tree2366dd236d1d9bf074b938ec2c18bec52a85425c
parente3e769ead0a4bbe1255d0bf4264dfb69e6ec6aa8 (diff)
downloadpylint-git-005e0c73d5b71f98254130b46f453c91590a22c4.tar.gz
Update the release documentation for pre-commit autoupdate to works
Closes #4245
-rw-r--r--doc/release.md11
1 files changed, 11 insertions, 0 deletions
diff --git a/doc/release.md b/doc/release.md
index 10f75c09a..1cbc22ee5 100644
--- a/doc/release.md
+++ b/doc/release.md
@@ -50,6 +50,17 @@ The master branch will have all the new features for the ``X.Y+1`` version
If you're doing a major release, you need to create the ``X.Y`` branch
where we will cherry-pick bugs to release the ``X.Y.Z+1`` minor versions
+### Merge tags in master for minor releases
+
+Merge the tag ``X.Y.Z`` in the main branch by doing an history only merge. It's done in order to signal that this is
+an offical release tag, and for ``pre-commit autoupdate`` to works.
+
+```bash
+git checkout master
+git merge --no-edit --strategy=ours pylint-X.Y.Z
+git push
+```
+
### Milestone handling
We move issue that were not done in the next milestone and block release only