On Thu, 6 Mar 2025 at 18:39, Jelte Fennema-Nio <postg...@jeltef.nl> wrote: > > On Thu, 6 Mar 2025 at 18:10, Tom Lane <t...@sss.pgh.pa.us> wrote: > > 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. > > It was using patch(1) in the past for that reason, but with --3way I > was able to get "git apply" to apply patches that patch(1) was unable > to apply. Also with the git command you get much more useful conflict > output.
Okay, I went for the approach of just trying everything until one works. Starting with "git am", then patch(1), and as a final attempt "git apply". Patch 5272 applies correctly now. I've removed any backoff caused by repeated failures for all existing patches, so all should be retried in the next ~48 hours.
