This fixes issue #69.
All in one nice, squashed commit.
Show informative error message when a merge conflict is detected in a…
… YAML file. This fixes issue #69.
Added this enhancement to the changelog.
Use generic Exception to make tests pass consistently.
💥 😄 🍻 Nice! Perfect and clean.... Thanks for the contribution!
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.”
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.
Ok, then it needs to be rephrased, but the point is that the error message should be informative about what the use should do.
Maybe we should add a method that takes a path so the user can be told which specific YAML file has the conflict?
@segiddins or another method to helper which reads the file directly?