From a9856a2ee11b085734bcf6ef802d369a6a96ce35 Mon Sep 17 00:00:00 2001 From: Andy Augustin Date: Sat, 16 Sep 2023 12:31:43 +0200 Subject: [PATCH] fix: :bug: (#380) small fix related to remote file mode changes --- src/sync_template.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/sync_template.sh b/src/sync_template.sh index cc500e8b..8408ecb2 100644 --- a/src/sync_template.sh +++ b/src/sync_template.sh @@ -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