Skip to content

Commit

Permalink
Merge branch 'develop' into fix/pr-comment-ci
Browse files Browse the repository at this point in the history
  • Loading branch information
liweijie0812 authored Aug 7, 2024
2 parents 11954b3 + dfe602d commit 35f3697
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion .github/workflows/pr-comment-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ jobs:
ssr_snap_conflict=$(git status | grep 'both modified:' | grep -c 'ssr.test.jsx.snap')
common_conflict=$(git status | grep 'both modified:' | grep -c '_common')
conflicts_sum=$((csr_snap_conflict + ssr_snap_conflict + common_conflict))
echo "conflict_count: $conflict_count"
echo "working_tree_clean: $working_tree_clean"
echo "csr_snap_conflict: $csr_snap_conflict"
Expand Down

0 comments on commit 35f3697

Please sign in to comment.