From db303b5955ac0572bd27cb38d5d5c641a22111b7 Mon Sep 17 00:00:00 2001
From: Daniel Bast <2790401+dbast@users.noreply.github.com>
Date: Wed, 22 Nov 2023 21:50:38 +0100
Subject: [PATCH] Switch to main branch based development

---
 CONTRIBUTING.md |  2 +-
 RELEASE.md      | 21 +++++++--------------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f799f8c2..8cb51b56 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,7 +2,7 @@
 
 ## Pull requests
 
-Make sure to make your pull requests against the `develop` branch.
+Make sure to make your pull requests against the `main` branch.
 
 ## Build
 
diff --git a/RELEASE.md b/RELEASE.md
index 8351e2ba..a227a763 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -1,6 +1,7 @@
 # Release
 
-- Update dependencies and fix any outdated dependencies.
+- Update dependencies and fix any outdated dependencies. (can be skipped as
+  Dependabot keeps everything updated)
 
 ```bash
 npm install -g npm-check-updates
@@ -16,22 +17,14 @@ npm-check-updates
 
 - Run the [build](./CONTRIBUTING.md#build).
 
-- All contributions currently go to the `develop` branch. To make a new
-  releasecheckout to the `main` branch and merge with `develop` and then proceed
-  with the release process. We also keep the `master` branch until `v3` is
-  released with a wrtning so we also merge this with develop.
+- We keep the `master` branch until `v3` is released with a warning so we also
+  merge this with main.
 
 ```bash
-git checkout develop
-git pull origin develop
-git checkout master
-git pull origin master
-git merge develop
+git remote update
+git checkout origin/master -b master
+git merge origin/main
 git push origin master
-git checkout main
-git pull origin main
-git merge develop
-git push origin main
 ```
 
 - Create a new named tag: