Skip to content

Instantly share code, notes, and snippets.

@Miciah

Miciah/gist:fb04a5f6199422ff256d

Created February 12, 2016 21:11
Show Gist options
  • Save Miciah/fb04a5f6199422ff256d to your computer and use it in GitHub Desktop.
Save Miciah/fb04a5f6199422ff256d to your computer and use it in GitHub Desktop.
Download ZIP
Raw
gistfile1.txt
% g merge dinhxuanvu/enterprise-rhc/enterprise-2.2
Auto-merging rel-eng/packages/rhc
CONFLICT (content): Merge conflict in rel-eng/packages/rhc
Auto-merging client.spec
CONFLICT (content): Merge conflict in client.spec
Automatic merge failed; fix conflicts and then commit the result.
zsh: exit 1 git merge dinhxuanvu/enterprise-rhc/enterprise-2.2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment