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