From 3371813c33a019de56199bda5c00bff0e6ba8e58 Mon Sep 17 00:00:00 2001
From: Vanilagy <1696106+Vanilagy@users.noreply.github.com>
Date: Fri, 8 Aug 2025 18:46:12 +0200
Subject: [PATCH] Bump version to 1.5.0, update release workflow

---
 .github/workflows/release.yml | 7 +++++++
 package.json                  | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 0312605..a267ce7 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,6 +16,13 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Merge main into release branch
+        run: |
+          git fetch origin main release
+          git checkout release
+          git merge origin/main --no-ff -m "Merge main into release for tag ${{ github.event.release.tag_name }}"
+          git push origin release
+
       - name: Set up Node.js
         uses: actions/setup-node@v4
         with:
diff --git a/package.json b/package.json
index 72a0ee1..34b623a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mediabunny",
   "author": "Vanilagy",
-  "version": "1.4.4",
+  "version": "1.5.0",
   "description": "Pure TypeScript media toolkit for reading, writing, and converting media files, directly in the browser.",
   "type": "module",
   "main": "./dist/bundles/mediabunny.cjs",