diff --git a/bin/commit_and_push_appcast.sh b/bin/commit_and_push_appcast.sh index 94644cd3..f18f9dea 100755 --- a/bin/commit_and_push_appcast.sh +++ b/bin/commit_and_push_appcast.sh @@ -19,8 +19,8 @@ git push origin HEAD:"${BRANCH}" if [ "${IS_SNAPSHOT}" = false ] ; then git reset --hard @ - git checkout develop - git merge master + git checkout -b for_appcast origin/develop + git merge --ff-only for_build cp appcast.xml appcast_snapshot.xml git commit appcast_snapshot.xml -m "Update appcast_snapshot with version ${COMPOUND_VERSION}" git push origin HEAD:develop