[Intel-gfx] ✗ Ro.CI.BAT: failure for Documentation: convert DocBook gpu.tmpl to reStructuredText
Patchwork
patchwork at emeril.freedesktop.org
Mon Jun 20 15:21:51 UTC 2016
== Series Details ==
Series: Documentation: convert DocBook gpu.tmpl to reStructuredText
URL : https://patchwork.freedesktop.org/series/8931/
State : failure
== Summary ==
Applying: Documentation/gpu: add new gpu.rst converted from DocBook gpu.tmpl
Using index info to reconstruct a base tree...
M Documentation/index.rst
Falling back to patching base and 3-way merge...
Auto-merging Documentation/index.rst
CONFLICT (content): Merge conflict in Documentation/index.rst
error: Failed to merge in the changes.
Patch failed at 0001 Documentation/gpu: add new gpu.rst converted from DocBook gpu.tmpl
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 Intel-gfx
mailing list