[igt-dev] ✗ Fi.CI.BAT: failure for RFC tools: capture execution pathways

Patchwork patchwork at emeril.freedesktop.org
Fri Apr 20 22:03:10 UTC 2018


== Series Details ==

Series: RFC tools: capture execution pathways
URL   : https://patchwork.freedesktop.org/series/42056/
State : failure

== Summary ==

Applying: RFC tools: capture execution pathways
Using index info to reconstruct a base tree...
M	tools/Makefile.am
Falling back to patching base and 3-way merge...
Auto-merging tools/Makefile.am
CONFLICT (content): Merge conflict in tools/Makefile.am
Patch failed at 0001 RFC tools: capture execution pathways
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".



More information about the igt-dev mailing list