Skip to content

Instantly share code, notes, and snippets.

@dpino

dpino/log

Created March 23, 2016 12:55
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save dpino/3231ebb830c038fa724f to your computer and use it in GitHub Desktop.
Save dpino/3231ebb830c038fa724f to your computer and use it in GitHub Desktop.
Download ZIP
Raw
log
Host: Linux snabb1 3.18.24 x86_64 Intel(R) Xeon(R) CPU E5-2620 v3 @ 2.40GHz
Image: lwaftr/snabb-test
Pull Request: #236
Current Head: 8364729b1cc4975e1c03e389de162e7e1bd7f3ed
Pull Request Head: 9f4b1b50473f018d5525dea86a99d959b276ad3c
ERROR: Failed to build 236
From https://github.com/igalia/snabbswitch
* [new ref] refs/pull/236/head -> pr236
Switched to branch 'pr236'
error: merge is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment