-
-
Save dpino/3d4a5849cef9a38ba94a 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
Host: Linux snabb1 3.18.24 x86_64 Intel(R) Xeon(R) CPU E5-2620 v3 @ 2.40GHz | |
Image: lwaftr/snabb-test | |
Pull Request: #255 | |
Current Head: 8364729b1cc4975e1c03e389de162e7e1bd7f3ed | |
Pull Request Head: 6b924923c7e2940af8105f728857a91caa8ab5c7 | |
ERROR: Failed to build 255 | |
++ git fetch origin pull/255/head:pr255 | |
From https://github.com/igalia/snabbswitch | |
* [new ref] refs/pull/255/head -> pr255 | |
++ git checkout --force pr255 | |
Switched to branch 'pr255' | |
++ git merge lwaftr | |
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