From f497b71d37cd689f6fcbce3104afe0f385eb3482 Mon Sep 17 00:00:00 2001
From: Elian Doran <contact@eliandoran.me>
Date: Sat, 21 Jun 2025 17:51:34 +0300
Subject: [PATCH] chore(rebrand): change references from `master` to `main`

---
 .github/workflows/playwright.yml                          | 2 +-
 _regroup/bin/release-flatpack.sh                          | 2 +-
 _regroup/bin/release.sh                                   | 8 --------
 .../1. Installing the server/Manually.html                | 2 +-
 .../1. Installing the server/Manually.md                  | 4 ++--
 5 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/playwright.yml b/.github/workflows/playwright.yml
index 8ea06d74b..739321cc6 100644
--- a/.github/workflows/playwright.yml
+++ b/.github/workflows/playwright.yml
@@ -3,7 +3,7 @@ name: playwright
 on:
   push:
     branches:
-      - master
+      - main
   pull_request:
 
 permissions:
diff --git a/_regroup/bin/release-flatpack.sh b/_regroup/bin/release-flatpack.sh
index f28ff7adb..31e42881b 100644
--- a/_regroup/bin/release-flatpack.sh
+++ b/_regroup/bin/release-flatpack.sh
@@ -24,7 +24,7 @@ if ! git diff-index --quiet HEAD --; then
     exit 1
 fi
 
-BASE_BRANCH=master
+BASE_BRANCH=main
 
 if [[ "$VERSION" == *"beta"* ]]; then
     BASE_BRANCH=beta
diff --git a/_regroup/bin/release.sh b/_regroup/bin/release.sh
index db3c62e4b..fe9a65a36 100644
--- a/_regroup/bin/release.sh
+++ b/_regroup/bin/release.sh
@@ -47,11 +47,3 @@ echo "Tagging commit with $TAG"
 
 git tag $TAG
 git push origin $TAG
-
-echo "Updating master"
-
-git fetch
-git checkout master
-git reset --hard origin/master
-git merge origin/develop
-git push
\ No newline at end of file
diff --git a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Manually.html b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Manually.html
index 8c9b34051..f7138444d 100644
--- a/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Manually.html	
+++ b/apps/server/src/assets/doc_notes/en/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Manually.html	
@@ -20,7 +20,7 @@
 <h2>Installation</h2>
 <h3>Download</h3>
 <p>You can either download source code zip/tar from <a href="https://github.com/TriliumNext/Notes/releases/latest">https://github.com/TriliumNext/Notes/releases/latest</a>.</p>
-<p>For the latest version including betas, clone Git repository <strong>from</strong>  <code>master</code>  <strong>branch</strong> with:</p><pre><code class="language-text-x-trilium-auto">git clone -b master https://github.com/triliumnext/notes.git</code></pre>
+<p>For the latest version including betas, clone Git repository <strong>from</strong>  <code>main</code>  <strong>branch</strong> with:</p><pre><code class="language-text-x-trilium-auto">git clone -b main https://github.com/triliumnext/notes.git</code></pre>
 <h2>Installation</h2><pre><code class="language-text-x-trilium-auto">cd trilium
 
 # download all node dependencies
diff --git a/docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Manually.md b/docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Manually.md
index 05c764adb..404262525 100644
--- a/docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Manually.md	
+++ b/docs/User Guide/User Guide/Installation & Setup/Server Installation/1. Installing the server/Manually.md	
@@ -28,10 +28,10 @@ sudo apt install libpng16-16 libpng-dev pkg-config autoconf libtool build-essent
 
 You can either download source code zip/tar from [https://github.com/TriliumNext/Notes/releases/latest](https://github.com/TriliumNext/Notes/releases/latest).
 
-For the latest version including betas, clone Git repository **from** `master` **branch** with:
+For the latest version including betas, clone Git repository **from** `main` **branch** with:
 
 ```
-git clone -b master https://github.com/triliumnext/notes.git
+git clone -b main https://github.com/triliumnext/notes.git
 ```
 
 ## Installation