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.

Sign up for GitHub

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

Jump to bottom

Test warning messages #6

Open

rconradharris opened this issue Jun 16, 2013 · 1 comment

Labels

bug

Owner

rconradharris commented Jun 16, 2013

Getting this when running the tests:

Failed to merge in the changes.
error: cache entry has null sha1: README
fatal: unable to write new index file

Using: git version 1.7.12.4 (Apple Git-37)

Don't recall getting this error message before. Need to test it against different versions of git.

Owner Author

rconradharris commented Jun 16, 2013

test_upstream_changed gives 'failed to merge in the changes'

test_abort gives that plus

error: cache entry has null sha1: README
fatal: unable to write new index file

Also, when it aborts it leaves the conflicting file in the working tree.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment