-
-
Save SnabbBot/1ad2a49a7ff2f522c59a81472e931152 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 snabbvirtbot 4.4.23 x86_64 Intel(R) Xeon(R) CPU E3-1246 v3 @ 3.50GHz | |
Image: eugeneia/snabb-nfv-test-vanilla | |
Pull Request: #736 | |
Target Head: 4b0c18beb86223414fcdbf0dc9e9f5fa5aaa2179 | |
Pull Request Head: 982b5a14ede75e5764f7d3f56292b75f0e1b1a3e | |
ERROR: Failed to build 736 | |
From https://github.com/SnabbCo/snabb | |
* [new ref] refs/pull/736/head -> pr736 | |
Switched to branch 'pr736' | |
error: Merging 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. | |
On branch pr736 | |
Unmerged paths: | |
(use "git reset HEAD <file>..." to unstage) | |
(use "git rm <file>..." to mark resolution) | |
both deleted: src/program/snabbmark/README | |
Untracked files: | |
(use "git add <file>..." to include in what will be committed) | |
src/ndpi/ | |
src/program/lwaftr/ | |
no changes added to commit (use "git add" and/or "git commit -a") | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment