fix: cc-resolve でマージコミットがあれば常に push するように修正

This commit is contained in:
nrslib 2026-02-28 13:48:49 +09:00
parent 8bb9ea4e8c
commit 88455b7594

View File

@ -290,9 +290,13 @@ jobs:
git add -A git add -A
if ! git diff --cached --quiet; then if ! git diff --cached --quiet; then
git commit -m "fix: resolve conflicts and review comments" 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 git push
else else
echo "No changes to commit" echo "Nothing to push"
fi fi
- name: Report result - name: Report result