| From: | Tom Lane <tgl(at)sss(dot)pgh(dot)pa(dot)us> |
|---|---|
| To: | Robert Haas <robertmhaas(at)gmail(dot)com> |
| Cc: | Bruce Momjian <bruce(at)momjian(dot)us>, Alvaro Herrera <alvherre(at)2ndquadrant(dot)com>, Magnus Hagander <magnus(at)hagander(dot)net>, PostgreSQL-development <pgsql-hackers(at)postgresql(dot)org> |
| Subject: | Re: Run pgindent now? |
| Date: | 2015-05-26 19:07:26 |
| Message-ID: | 23155.1432667246@sss.pgh.pa.us |
| Views: | Raw Message | Whole Thread | Download mbox | Resend email |
| Thread: | |
| Lists: | pgsql-hackers |
Robert Haas <robertmhaas(at)gmail(dot)com> writes:
> Realistically, with merge.conflictstyle = diff3 (why is this not the
> default?), resolving whitespace conflicts that occur when you try to
> cherry-pick is typically not very difficult.
Really? The problems I have generally come from places where pgindent
has changed the line breaks, not just horizontal spacing. I haven't
seen anything that copes with this, certainly not git.
regards, tom lane
| From | Date | Subject | |
|---|---|---|---|
| Next Message | Alvaro Herrera | 2015-05-26 19:32:42 | Re: Run pgindent now? |
| Previous Message | Josh Berkus | 2015-05-26 18:56:22 | Re: ERROR: MultiXactId xxxx has not been created yet -- apparent wraparound |