From b0d3e27b775ed33722edcf09556930674acb3af8 Mon Sep 17 00:00:00 2001 From: Cycle Bai <168964798+CycleBai@users.noreply.github.com> Date: Mon, 29 Jul 2024 22:12:45 +1000 Subject: [PATCH] ci: Fix errors --- .github/workflows/auto_pr.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/auto_pr.yml b/.github/workflows/auto_pr.yml index cfda638..10ce591 100644 --- a/.github/workflows/auto_pr.yml +++ b/.github/workflows/auto_pr.yml @@ -44,6 +44,7 @@ jobs: echo "$(date +%s%N)" > timestamp.txt # Create a file with current timestamp in nanoseconds git add timestamp.txt git commit -m "Add timestamp file to ensure branch differences" + git config pull.rebase true git pull origin ${{ steps.hash_committer.outputs.branch_name }} git push origin ${{ steps.hash_committer.outputs.branch_name }}