On Tue, Mar 1, 2022, at 3:27 AM, osumi.takami...@fujitsu.com wrote: > $ git am v1-0001-Time-delayed-logical-replication-subscriber.patch I generally use -3 to fall back on 3-way merge. Doesn't it work for you?
-- Euler Taveira EDB https://www.enterprisedb.com/