From 3f21829810fbafb81a43f97860fa1296ef70df2c Mon Sep 17 00:00:00 2001 From: Erick Ahmed Date: Tue, 11 Nov 2025 14:56:44 +0100 Subject: [PATCH] Fix master branch name --- .gitea/workflows/sync-upstream.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/sync-upstream.yml b/.gitea/workflows/sync-upstream.yml index 08936bd..cfdc36f 100644 --- a/.gitea/workflows/sync-upstream.yml +++ b/.gitea/workflows/sync-upstream.yml @@ -19,12 +19,12 @@ jobs: git remote add upstream https://git.suckless.org/surf || true git fetch upstream - - name: Merge upstream into master + - name: Merge upstream into surf-webkit2 run: | - git checkout master - git merge upstream/master --strategy-option ours --no-edit || true + git checkout surf-webkit2 + git merge upstream/surf-webkit2 --strategy-option ours --no-edit || true - name: Push merged branch run: | - git push origin master + git push origin surf-webkit2