Skip to content

Instantly share code, notes, and snippets.

@thumbot

thumbot/merge.txt Secret

Created November 10, 2016 21:54
Show Gist options
  • Save thumbot/2c8c2752b1a83abe8cd388b84aab1c49 to your computer and use it in GitHub Desktop.
Save thumbot/2c8c2752b1a83abe8cd388b84aab1c49 to your computer and use it in GitHub Desktop.
Download ZIP
Raw
merge.txt
#<Git::GitExecuteError: git '--git-dir=/tmp/thumbs/develop-2.2#490cd21#fd-update-ibrowse-to-42#7a47346/.git' '--work-tree=/tmp/thumbs/develop-2.2#490cd21#fd-update-ibrowse-to-42#7a47346' merge '-m' 'merge' '7a47346c23354dfca9316bce477922c7b82fffe9' 2>&1:Auto-merging src/yz_app.erl
CONFLICT (content): Merge conflict in src/yz_app.erl
Auto-merging rebar.config
CONFLICT (content): Merge conflict in rebar.config
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