[igt-dev] ✗ Fi.CI.BAT: failure for series starting with [i-g-t,1/4] gitlab-ci: Parametrize images used with CI_ variables

Patchwork
2018-10-24T17:58:12Z

== Series Details ==

Series: series starting with [i-g-t,1/4] gitlab-ci: Parametrize images used with CI_ variables
URL : https://patchwork.freedesktop.org/series/51451/
State : failure

== Summary ==

Applying: gitlab-ci: Parametrize images used with CI_ variables
Using index info to reconstruct a base tree...
M .gitlab-ci.yml
Falling back to patching base and 3-way merge...
Auto-merging .gitlab-ci.yml
CONFLICT (content): Merge conflict in .gitlab-ci.yml
Patch failed at 0001 gitlab-ci: Parametrize images used with CI_ variables
Use 'git am --show-current-patch' to see the failed 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".