Skip to content

Commit

Permalink
[CI] Update merge main to develop lane
Browse files Browse the repository at this point in the history
  • Loading branch information
testableapple committed Jul 31, 2024
1 parent 9eb77e6 commit c00f6dd
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions fastlane/Fastfile
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,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 HEAD:develop')
end

private_lane :appstore_api_key do
Expand Down

0 comments on commit c00f6dd

Please sign in to comment.