Show informative error message when a merge conflict is detected in a YAML file.

[luisdelarosa]

This fixes issue #69.
All in one nice, squashed commit.
😃

[fabiopelosin]

💥 😄 🍻 Nice! Perfect and clean.... Thanks for the contribution!

[alloy]

Very nice! I think the error message could use some improvement, though. E.g. “Merge conflict(s) detected” -> “Merge conflict detected in spec repo. Please change to the Git repo at ~/.cocoapods/repos/NAME and solve the conflict manually.”

[fabiopelosin]

This error is not specify to the specs repo. For example it could be the result of a merge conflict in the Podfile.lock file.

[alloy]

Ok, then it needs to be rephrased, but the point is that the error message should be informative about what the use should do.

[segiddins]

Maybe we should add a method that takes a path so the user can be told which specific YAML file has the conflict?

[fabiopelosin]

@segiddins or another method to helper which reads the file directly?

[segiddins]

Yeah. That way it can point out which files load failed.

-Samuel E. Giddins

On Apr 18, 2014, at 1:33 AM, Fabio Pelosin notifications@github.com wrote:

@segiddins or another method to helper which reads the file directly.

—
Reply to this email directly or view it on GitHub.

[alloy]

👍