On Sat, 2013-09-14 at 11:37 -0700, Josh Berkus wrote: > Lately I've been running into a lot of reports of false conflicts > reported by "git apply". The most recent one was the "points" patch, > which git apply rejected for completely ficticious reasons (it claimed > that the patch was trying to create a new file where a file already > existed, which it wasn't)
Every file in that patch contains new file mode 100644 which means it is creating a new file. I would review how that patch was created. -- Sent via pgsql-hackers mailing list (pgsql-hackers@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-hackers
