From 7ba7e5916b35c7bbeba149be06c5a7e722a05c38 Mon Sep 17 00:00:00 2001
From: houseme <housemecn@gmail.com>
Date: Fri, 20 Dec 2024 20:19:59 +0800
Subject: [PATCH] fix

---
 .github/workflows/golangci-lint.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index 0c8d37b91a0..8cec9bee6e2 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -137,6 +137,8 @@ jobs:
           if [[ "${{ github.event_name }}" == "push" ]]; then
             git push origin HEAD:$(git rev-parse --abbrev-ref HEAD)
           else
+            git pull origin
+            git merge origin/${{ github.event.pull_request.head.ref }}
             git push origin HEAD:${{ github.event.pull_request.head.ref }}
           fi
           # git push  origin HEAD:$(git rev-parse --abbrev-ref HEAD)