diff --git a/.gitea/workflows/workflow.yml b/.gitea/workflows/workflow.yml index 95c7e7f..ab4254c 100644 --- a/.gitea/workflows/workflow.yml +++ b/.gitea/workflows/workflow.yml @@ -22,11 +22,11 @@ jobs: - name: Fetch AUR run: git fetch aur - - name: Rebase current changes - run: git rebase aur/master + - name: Merge latest changes + run: git merge aur/master - name: Push changes (if any) - run: git push -f origin master + run: git push origin master wake: name: Wake Runner