From 0f16372585d9032557a5a8a293026d433ee212a8 Mon Sep 17 00:00:00 2001 From: c0fec0de Date: Wed, 11 Oct 2023 23:32:13 +0200 Subject: [PATCH] precise contribute --- CONTRIBUTE.md | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTE.md b/CONTRIBUTE.md index d18e21b..efd36e7 100644 --- a/CONTRIBUTE.md +++ b/CONTRIBUTE.md @@ -5,8 +5,11 @@ * `2.x.x` main line for 2.x.x * `3.x.x` actual main line * documentation links refer to `3.x.x` + * 2.x.x can be merged to 3.x.x * `main` * documentation links refer to `latest` + * 3.x.x can be merged to main +* `stable` main line for 2.x.x with release tags ## Testing @@ -39,7 +42,19 @@ tox ### Release ```bash -git pull +# Update 3.x.x +git checkout 3.x.x +git pull origin 2.x.x +git push origin 3.x.x + +# Update main +git checkout main +git pull origin 3.x.x +git push origin main + +# Update release branch - currently 2.x.x +git checkout stable +git pull origin 2.x.x prev_version=$(poetry version -s)