From 819c1bc2d6e7d956c4556241cbf2e4f90ca8a981 Mon Sep 17 00:00:00 2001
From: Radoslaw Karabowicz <r.karabowicz@gsi.de>
Date: Fri, 24 May 2024 11:37:16 +0200
Subject: [PATCH] docs(CONTRIBUTING): Add section to release process

Added section about complicated patch branch merging process.
Added section about major version.
---
 CONTRIBUTING.md | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index b815bd4891..ca0dd2c76e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -203,8 +203,34 @@ git push origin v{x.y.z}
 ```sh
 git checkout master
 git merge origin/v{x.y}_patches
-git push mainrepo origin
+git push origin master
 ```
 
 The message, when prompted, should be `Merge v{x.y.z}`.
 The merge and push should not be forced.
+
+### Should the patch branch diverge too much from master:
+
+```sh
+git checkout master
+git merge -s ours v{x.y}_patches
+git checkout --detach v{x.y}_patches
+git reset --soft master
+git checkout master
+git commit --amend -C HEAD
+git push origin master
+```
+
+This merges the patch branch onto master, discarding
+any changes from master and keeps changes from patches.
+
+## For major versions merge master back on dev:
+
+```sh
+git checkout dev
+git merge master
+git push origin dev
+```
+
+This reunites the dev and master, making future
+merging easier.