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.
