Skip to content

Commit

Permalink
ci(i18n): add error message for merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
zyf722 committed Nov 3, 2024
1 parent 08497ae commit b76da90
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion .github/workflows/i18n-update-scheduled.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,13 @@ jobs:
- name: Push changes
run: |
git pull origin ${{ github.event.repository.default_branch }}
git pull origin ${{ github.event.repository.default_branch }} || {
echo "Failed to pull from ${{ github.event.repository.default_branch }}."
echo "Please manually pull the changes, solve potential conflicts, and re-run the workflow."
exit 1
}
git push origin $BRANCH
- name: Check if has differences between ${{ env.BRANCH }} and ${{ github.event.repository.default_branch }}
Expand Down

0 comments on commit b76da90

Please sign in to comment.