From fa3b8ae1fcdea731368d1435354213de83e479fd Mon Sep 17 00:00:00 2001 From: Maxim Khatskevich Date: Thu, 13 Nov 2014 21:36:54 +0000 Subject: Minor improvement in '.gitignore' file. When you work in a team, it is really useful to have 'Podfile.lock' in gitignore as well. In a case when this file IS under version control and your teammate added something into 'Podfile', installed new pods on his machine and then you are pulling his fixes into your working copy - your working copy seems to be consistent for Cocoapods (because Podfile and Podfile.lock are in sync), but in fact your working copy is missing a new pod files, so you'll get build errors and will wonder what happens. But if we keep Podfile.lock in gitignore - you easily will fix that by just running standard 'pod install' command in Terminal. --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 6cb04ace..08119d07 100644 --- a/.gitignore +++ b/.gitignore @@ -25,4 +25,5 @@ DerivedData *.xccheckout #CocoaPods -Pods \ No newline at end of file +Pods +Podfile.lock -- cgit v1.2.3