-
-
Save lwaftr-igalia/fe8c895fe42256ff0b01 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: #287 | |
Current Head: 8364729b1cc4975e1c03e389de162e7e1bd7f3ed | |
Pull Request Head: de19a93db55847c29b08b5c4cd594775078a9771 | |
ERROR: Failed to build 287 | |
++ git fetch origin pull/287/head:pr287 | |
From https://github.com/igalia/snabbswitch | |
* [new ref] refs/pull/287/head -> pr287 | |
++ git checkout --force pr287 | |
Switched to branch 'pr287' | |
++ git merge origin/lwaftr | |
Auto-merging src/program/top/top.lua | |
CONFLICT (content): Merge conflict in src/program/top/top.lua | |
Auto-merging src/program/snabbnfv/nfvconfig.lua | |
Auto-merging src/program/lwaftr/transient/transient.lua | |
CONFLICT (add/add): Merge conflict in src/program/lwaftr/transient/transient.lua | |
Auto-merging src/program/lwaftr/run_nohw/run_nohw.lua | |
CONFLICT (add/add): Merge conflict in src/program/lwaftr/run_nohw/run_nohw.lua | |
Auto-merging src/program/lwaftr/run/run.lua | |
CONFLICT (add/add): Merge conflict in src/program/lwaftr/run/run.lua | |
Auto-merging src/program/lwaftr/loadtest/loadtest.lua | |
CONFLICT (add/add): Merge conflict in src/program/lwaftr/loadtest/loadtest.lua | |
Auto-merging src/program/lwaftr/bench/bench.lua | |
CONFLICT (add/add): Merge conflict in src/program/lwaftr/bench/bench.lua | |
Auto-merging src/lib/pmu.lua | |
Auto-merging src/lib/checksum.lua | |
Auto-merging src/lib/checksum.h | |
Auto-merging src/lib/checksum.c | |
CONFLICT (content): Merge conflict in src/lib/checksum.c | |
Auto-merging src/core/packet.lua | |
Auto-merging src/core/lib.lua | |
Auto-merging src/core/app.lua | |
CONFLICT (content): Merge conflict in src/core/app.lua | |
Auto-merging src/apps/rate_limiter/rate_limiter.lua | |
Auto-merging src/apps/lwaftr/ipv4_apps.lua | |
CONFLICT (add/add): Merge conflict in src/apps/lwaftr/ipv4_apps.lua | |
Auto-merging src/apps/basic/basic_apps.lua | |
Auto-merging src/README.src.md | |
Auto-merging src/README.md | |
Auto-merging src/Makefile | |
Auto-merging Makefile | |
CONFLICT (content): Merge conflict in Makefile | |
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