Set reasonable version specs in Podfile. Remove Podfile.lock from version control and ignore the file. No more Podfile.lock silliness!