Jelte Fennema-Nio <postgres@jeltef.nl> writes:
> 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.
Please see if you can make it use patch(1). IME git is too
stiff-necked about slightly stale patches no matter which
subcommand you use.
regards, tom lane