From 178a15b6d5883377ef8355aeefd36770b176b21a Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Thu, 9 Jan 2025 20:11:03 +0100 Subject: [PATCH] update related to rebase v3 --- Development-Testing-Release.md | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/Development-Testing-Release.md b/Development-Testing-Release.md index f81563e..bda92cd 100644 --- a/Development-Testing-Release.md +++ b/Development-Testing-Release.md @@ -79,19 +79,19 @@ tox Commit changes -``` +```bash git commit -a ``` Create release tag -``` +```bash git tag v$VERSION ``` Push -``` +```bash git push git push --tags ``` @@ -113,6 +113,13 @@ After RPMs are successfully built, mark it as latest release * Rebase major version branch (currently "v3") with "master" +```bash +git checkout v3 +git rebase master +git push +git checkout master +``` + ## Turn back master to devel | File | Action | @@ -123,12 +130,12 @@ After RPMs are successfully built, mark it as latest release Commit changes -``` +```bash git commit -a ``` Push -``` +```bash git push ``` \ No newline at end of file