From 88455b7594f9575f9f270bec042d9b1c293c10ff Mon Sep 17 00:00:00 2001
From: nrslib <38722970+nrslib@users.noreply.github.com>
Date: Sat, 28 Feb 2026 13:48:49 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20cc-resolve=20=E3=81=A7=E3=83=9E=E3=83=BC?=
 =?UTF-8?q?=E3=82=B8=E3=82=B3=E3=83=9F=E3=83=83=E3=83=88=E3=81=8C=E3=81=82?=
 =?UTF-8?q?=E3=82=8C=E3=81=B0=E5=B8=B8=E3=81=AB=20push=20=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/cc-resolve.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/cc-resolve.yml b/.github/workflows/cc-resolve.yml
index 5cfad4e..2d6582d 100644
--- a/.github/workflows/cc-resolve.yml
+++ b/.github/workflows/cc-resolve.yml
@@ -290,9 +290,13 @@ jobs:
           git add -A
           if ! git diff --cached --quiet; then
             git commit -m "fix: resolve conflicts and review comments"
+          fi
+          AHEAD=$(git rev-list --count origin/${{ steps.pr.outputs.branch }}..HEAD 2>/dev/null || echo "0")
+          if [ "$AHEAD" -gt 0 ]; then
+            echo "Pushing $AHEAD commit(s)"
             git push
           else
-            echo "No changes to commit"
+            echo "Nothing to push"
           fi
 
       - name: Report result