diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 40b38687..8b7cd091 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -142,6 +142,7 @@ end lane :merge_main_to_develop do if is_ci + sh('git config --global user.name "Stream Bot"') sh('git reset --hard') else ensure_git_status_clean @@ -150,10 +151,10 @@ lane :merge_main_to_develop do sh('git checkout main') sh('git pull origin main') sh('git checkout origin/develop') - sh('git pull') + sh('git pull origin develop') sh('git log develop..main') sh('git merge main') - sh('git push') + sh('git push origin develop') end private_lane :appstore_api_key do