We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
There was an error while loading. Please reload this page.
1 parent cfcbb13 commit acfa498Copy full SHA for acfa498
fastlane/Fastfile
@@ -142,6 +142,7 @@ end
142
143
lane :merge_main_to_develop do
144
if is_ci
145
+ sh('git config --global user.name "Stream Bot"')
146
sh('git reset --hard')
147
else
148
ensure_git_status_clean
@@ -150,10 +151,10 @@ lane :merge_main_to_develop do
150
151
sh('git checkout main')
152
sh('git pull origin main')
153
sh('git checkout origin/develop')
- sh('git pull')
154
+ sh('git pull origin develop')
155
sh('git log develop..main')
156
sh('git merge main')
- sh('git push')
157
+ sh('git push origin develop')
158
end
159
160
private_lane :appstore_api_key do
0 commit comments