-
-
Save thumbot/b541631c066a4cd69d56489ca270a3bb to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| #<Git::GitExecuteError: git '--git-dir=/tmp/thumbs/develop.33baff6.find-unique-user-by-metadata.7b92fd6/.git' '--work-tree=/tmp/thumbs/develop.33baff6.find-unique-user-by-metadata.7b92fd6' merge '-m' 'merge' '7b92fd684fc26110cdf2822e5bf171adfac4c3ad' 2>&1:error: Your local changes to the following files would be overwritten by merge: | |
| src/riak_core_security.erl | |
| test/riak_core_security_tests.erl | |
| Please, commit your changes or stash them before you can merge. | |
| Aborting> |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment