diff options
author | Pierre Sassoulas <pierre.sassoulas@gmail.com> | 2021-03-21 18:45:17 +0100 |
---|---|---|
committer | Pierre Sassoulas <pierre.sassoulas@gmail.com> | 2021-03-21 18:55:12 +0100 |
commit | 02a3a924420652835a4dbb3ccbede410aae9084b (patch) | |
tree | 3f3e37ec780c35b55a89bd0a1ca8cc27d1a7efb1 | |
parent | cdfc8374b1b0ee88af0463bdbe58299186244d53 (diff) | |
download | pylint-git-02a3a924420652835a4dbb3ccbede410aae9084b.tar.gz |
Update the release documentation for pre-commit autoupdate to works
Closes #4245
-rw-r--r-- | doc/release.md | 11 |
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 |