New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from Apr 7, 2014

Conversation

Projects
None yet
4 participants
@luisdelarosa
Contributor

luisdelarosa commented Apr 5, 2014

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

@fabiopelosin

This comment has been minimized.

Show comment
Hide comment
@fabiopelosin

fabiopelosin Apr 7, 2014

Member

馃挜 馃槃 馃嵒 Nice! Perfect and clean.... Thanks for the contribution!

Member

fabiopelosin commented Apr 7, 2014

馃挜 馃槃 馃嵒 Nice! Perfect and clean.... Thanks for the contribution!

fabiopelosin added a commit that referenced this pull request Apr 7, 2014

Merge pull request #100 from luisdelarosa/check_for_merge_commits_in_鈥
鈥aml_squashed

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

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

1 check passed

continuous-integration/travis-ci The Travis CI build passed
Details
@alloy

This comment has been minimized.

Show comment
Hide comment
@alloy

alloy Apr 8, 2014

Member

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

Member

alloy commented Apr 8, 2014

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

@fabiopelosin

This comment has been minimized.

Show comment
Hide comment
@fabiopelosin

fabiopelosin Apr 8, 2014

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.

Member

fabiopelosin commented Apr 8, 2014

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

This comment has been minimized.

Show comment
Hide comment
@alloy

alloy Apr 8, 2014

Member

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

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

This comment has been minimized.

Show comment
Hide comment
@segiddins

segiddins Apr 17, 2014

Member

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

Member

segiddins commented Apr 17, 2014

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

@fabiopelosin

This comment has been minimized.

Show comment
Hide comment
@fabiopelosin

fabiopelosin Apr 18, 2014

Member

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

Member

fabiopelosin commented Apr 18, 2014

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

@segiddins

This comment has been minimized.

Show comment
Hide comment
@segiddins

segiddins Apr 18, 2014

Member

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.

Member

segiddins commented Apr 18, 2014

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

This comment has been minimized.

Show comment
Hide comment
@alloy

alloy Apr 18, 2014

Member

馃憤

Member

alloy commented Apr 18, 2014

馃憤

Ashton-W pushed a commit to Ashton-W/Core that referenced this pull request Nov 2, 2015

Merge pull request #100 from luisdelarosa/check_for_merge_commits_in_鈥
鈥aml_squashed

Show informative error message when a merge conflict is detected in a YAML file.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment