Skip to content
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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More informative output in expect_identical() #319

Merged
merged 3 commits into from Nov 10, 2015

Conversation

@krlmlr
Copy link
Member

@krlmlr krlmlr commented Nov 10, 2015

  • using compare()
@@ -3,6 +3,9 @@
* Added [Catch](https://github.com/philsquared/Catch) for unit testing of C++ code.
See `?use_catch()` for more details. (@kevinushey)

* `expect_identical()` and `is_identical_to()` now use `compare()` for more

This comment has been minimized.

@hadley

hadley Nov 10, 2015
Member

FWIW I think it's safer to always put new NEWS items at the top, so they're anchored at a fixed position.

hadley added a commit that referenced this pull request Nov 10, 2015
More informative output in expect_identical()
@hadley hadley merged commit e209511 into r-lib:master Nov 10, 2015
2 checks passed
2 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@kevinushey

This comment has been minimized.

Copy link
Collaborator

@kevinushey kevinushey commented on c2a3804 Nov 10, 2015

@krlmlr does this help ensure that PRs which update NEWS won't get merge conflicts? This seems like it would be nice to have as a default from devtools or something similar.

This comment has been minimized.

Copy link
Member

@krlmlr krlmlr replied Nov 10, 2015

Yes, that's right: http://krlmlr.github.io/using-gitattributes-to-avoid-merge-conflicts/. Unfortunately, this setting can lead to duplicate entries, so use with care.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants