David Steele wrote: > This patch no longer applies cleanly: > > $ git apply ../other/group_update_clog_v6.patch
Normally "git apply -3" gives good results in these cases -- it applies the 3-way merge algorithm just as if you had applied the patch to the revision it was built on and later git-merged with the latest head. -- Álvaro Herrera http://www.2ndQuadrant.com/ PostgreSQL Development, 24x7 Support, Remote DBA, Training & Services -- Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers
