Joseph Koshakow <kosh...@gmail.com> writes: > Sorry about that, I didn't have my IDE set up quite right and > noticed a little too late that I had some auto-formatting turned > on. Thanks for doing the rebase, did it end up fixing > the whitespace issues? If not I'll go through the patch and try > and fix them all.
No, I just fixed the merge failure. Our standard way to clean up whitespace issues and make sure code meets our layout conventions is to run pgindent over it [1]. For this particular patch, that might be too much, because it will reindent the sections that you added braces around, making the patch harder to review. So maybe the best bet is to leave well enough alone and expect the committer to re-pgindent before pushing it. However, if you spot any diff hunks where there's just a whitespace change, getting rid of those would be appreciated. regards, tom lane [1] https://wiki.postgresql.org/wiki/Running_pgindent_on_non-core_code_or_development_code