Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: 🐛 (#380) small fix related to remote file mode changes #383

Merged
merged 1 commit into from
Sep 16, 2023
Merged

fix: 🐛 (#380) small fix related to remote file mode changes #383

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/sync_template.sh
View file
Open in desktop
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