Switched to a new branch '20210210092628.193785-1-stefanha@redhat.com' Applying: .github: point Repo Lockdown bot to GitLab repo Using index info to reconstruct a base tree... A .github/lockdown.yml Falling back to patching base and 3-way merge... CONFLICT (modify/delete): .github/lockdown.yml deleted in HEAD and modified in .github: point Repo Lockdown bot to GitLab repo. Version .github: point Repo Lockdown bot to GitLab repo of .github/lockdown.yml 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 .github: point Repo Lockdown bot to GitLab repo 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".