Skip to content

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

Merged
merged 3 commits into from Apr 7, 2014

4 participants

@luisdelarosa

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

@fabiopelosin
CocoaPods member

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

@fabiopelosin fabiopelosin merged commit 0f24d8f into CocoaPods:master Apr 7, 2014

1 check passed

Details continuous-integration/travis-ci The Travis CI build passed
@alloy
CocoaPods member
alloy commented Apr 8, 2014

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
CocoaPods member

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
CocoaPods member
alloy commented Apr 8, 2014

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
CocoaPods member

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

@fabiopelosin
CocoaPods member

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

@segiddins
CocoaPods member
@alloy
CocoaPods member
alloy commented Apr 18, 2014

👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.