On Wed, Aug 28, 2024 at 9:44 AM Zhijie Hou (Fujitsu) <houzj.f...@fujitsu.com> wrote: > > > > +1 on 'update_origin_differs' instead of 'update_origins_differ' as > > > the former is somewhat similar to other conflict names 'insert_exists' > > > and 'update_exists'. > > > > Since we reached a consensus on this, I am attaching a small patch to rename > > as suggested. > > Sorry, I attached the wrong patch. Here is correct one. >
LGTM. thanks Shveta