fix(command-compile): try to check rebasing issues

Signed-off-by: John Molakvoæ <skjnldsv@users.noreply.github.com>
nextcloud · Feb 1, 2024 · 348247f · 348247f
1 parent 199b950
commit 348247f
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.github/workflows/command-compile.yml b/.github/workflows/command-compile.yml
@@ -100,7 +100,8 @@ jobs:
         if: ${{ contains(needs.init.outputs.arg1, 'rebase') }}
         run: |
           git fetch origin ${{ needs.init.outputs.base_ref }}:${{ needs.init.outputs.base_ref }}
-          git rebase ${{ needs.init.outputs.base_ref }}
+          git status
+          git rebase origin/${{ needs.init.outputs.base_ref }}
 
       - name: Commit and push default
         if: ${{ !contains(needs.init.outputs.arg1, 'fixup') && !contains(needs.init.outputs.arg1, 'amend') }}