Skip to content

Commit

Permalink
fix: 🐛 (#380) small fix related to remote file mode changes
Browse files Browse the repository at this point in the history
  • Loading branch information
AndreasAugustin committed Sep 16, 2023
1 parent 35e8a35 commit a9856a2
Showing 1 changed file with 8 additions and 1 deletion.
9 changes: 8 additions & 1 deletion src/sync_template.sh
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,14 @@ debug "create new branch from default branch with name ${NEW_BRANCH}"
git checkout -b "${NEW_BRANCH}"
debug "pull changes from template"

eval "git pull ${SOURCE_REPO} ${GIT_REMOTE_PULL_PARAMS}"
eval "git pull ${SOURCE_REPO} ${GIT_REMOTE_PULL_PARAMS}" || PULL_HAS_ISSUES=true

if [ "$PULL_HAS_ISSUES" == true ] ; then
warn "There had been some git pull issues."
warn "Maybe a merge issue."
warn "We go on but it is likely that you need to fix merge issues within the created PR."
fi

echo "::endgroup::"

# Check if the Ignore File exists inside .github folder or if it doesn't exist at all
Expand Down

0 comments on commit a9856a2

Please sign in to comment.