CocoaPods/Xcodeproj — pull request #192 by mrackwitz (2014-09-26 22:03:10+00:00)
Title: Recognize merge conflicts

Fail pre-emptively on merge conflicts, because they happen very often in Xcode projects due their nature, and the resulting error would depend on the position of the conflict marks.