lysann/passforios
1
0
Fork 0
Code Issues Pull requests Activity

Merge, fix conflict

Browse source
This commit is contained in:
Yishi Lin 2017-03-31 03:10:25 +08:00
commit d28dde8719
26 changed files with 262 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

9
fastlane/Fastfile
View file

@ -52,13 +52,22 @@ platform :ios do
keychain_password: ENV["MATCH_KEYCHAIN_PASSWORD"],
readonly: true
)
<<<<<<< HEAD
# ensure_git_status_clean
=======
ensure_git_status_clean
>>>>>>> uiimprovement
increment_build_number(
build_number: latest_testflight_build_number + 1,
xcodeproj: "pass.xcodeproj"
)
<<<<<<< HEAD
# commit_version_bump(xcodeproj: "pass.xcodeproj")
# push_to_git_remote
=======
commit_version_bump(xcodeproj: "pass.xcodeproj")
push_to_git_remote(local_branch: "develop")
>>>>>>> uiimprovement
gym(scheme: "pass")
pilot(skip_waiting_for_build_processing: true)
mailgun(