Skip to content

Instantly share code, notes, and snippets.

@thumbot

thumbot/merge.txt Secret

Created December 1, 2016 18:07
Show Gist options
  • Save thumbot/551c6a2c4341458a3f11328a2072677f to your computer and use it in GitHub Desktop.
Save thumbot/551c6a2c4341458a3f11328a2072677f to your computer and use it in GitHub Desktop.
Download ZIP
Raw
merge.txt
#<Git::GitExecuteError: git '--git-dir=/tmp/thumbs/develop.fc14e4c.feature-gg-delete.f7f0e78/.git' '--work-tree=/tmp/thumbs/develop.fc14e4c.feature-gg-delete.f7f0e78' merge '-m' 'merge' 'f7f0e78a660b3f3f02db0c44fdb5a7744cd35933' 2>&1:Auto-merging src/riak_ql_parser.yrl
Auto-merging src/riak_ql_lexer.xrl
Auto-merging src/riak_ql_ddl_compiler.erl
CONFLICT (content): Merge conflict in src/riak_ql_ddl_compiler.erl
Automatic merge failed; fix conflicts and then commit the result.>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment