[Intel-gfx] ✗ Fi.CI.BUILD: failure for nightly.conf: drop amd branches from drm-tip

[Patchwork]

== Series Details ==

Series: nightly.conf: drop amd branches from drm-tip
URL   : https://patchwork.freedesktop.org/series/90317/
State : failure

== Summary ==

Applying: nightly.conf: drop amd branches from drm-tip
Using index info to reconstruct a base tree...
A	nightly.conf
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): nightly.conf deleted in HEAD and modified in nightly.conf: drop amd branches from drm-tip. Version nightly.conf: drop amd branches from drm-tip of nightly.conf left in tree.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 nightly.conf: drop amd branches from drm-tip
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".