From 2c8c54ee75f0cee82555ca7ab2d9982b97067155 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 25 Jun 2025 08:02:03 +0000
Subject: [PATCH 1/2] Update manifest.json to version

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index 598fa5e..55baf21 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "id": "folder-notes",
   "name": "Folder notes",
-  "version": "1.8.7",
+  "version": "1.8.8",
   "minAppVersion": "0.15.0",
   "description": "Create notes within folders that can be accessed without collapsing the folder, similar to the functionality offered in Notion.",
   "author": "Lost Paul",

From c8e54037c675ba02910d56e3def3af295810602b Mon Sep 17 00:00:00 2001
From: Lost Paul <70213368+LostPaul@users.noreply.github.com>
Date: Wed, 25 Jun 2025 10:41:23 +0200
Subject: [PATCH 2/2] Update release.yaml

---
 .github/workflows/release.yaml | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 0cb6248..2023ed5 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -45,15 +45,12 @@ jobs:
           git commit -m "Update manifest.json to version $VERSION" || echo "No changes to commit"
           git push origin main
 
-      # Switch back to the original branch ONLY if not 'main'
-      - name: Checkout original branch (if not main)
+
+      - name: Ensure HEAD is at updated main commit
         run: |
-          if [ "${{ env.BRANCH_NAME }}" != "main" ]; then
-            git checkout "${{ env.BRANCH_NAME }}"
-            git pull origin "${{ env.BRANCH_NAME }}"
-          else
-            echo "Already on main branch; skipping checkout."
-          fi
+            git fetch origin
+            git checkout main
+            git reset --hard origin/main
 
       - name: npm build
         run: |