Nikita Malakhov <huku...@gmail.com> writes: > I've ran pdindent on the whole Postgres and it'd changed > an awful lot of source files. Won't it create a lot of merge conflicts?
Well, yeah, you've rediscovered the fact that a lot of commits are sloppy about this, and it's been awhile since our last tree-wide pgindent. Our normal process has been to do a cleanup pgindent run annually or so, usually after the end of the last commitfest of a cycle when there's plenty of time for people to deal with the ensuing merge conflicts. If we could get to "commits are pgindent clean to begin with", we could avoid the merge problems from one-big-reindent. I'd still be inclined to do an annual run as a backup, but hopefully it would find few problems. regards, tom lane