On Thu, 6 Mar 2025 at 16:36, vignesh C <vignes...@gmail.com> wrote: > But it applies neatly for me and Jim also at [3]. Any idea why patch > apply fails with CFbot whereas it passes in our environment?
Okay, the cause of this seems to be that the CFbot currently uses "git apply --3way", not "git am --3way". For some reason "git apply" fails to apply the patch while "git am" succeeds. I'll check this weekend if I can change the logic to use "git am" instead.
