On Thu, Nov 28, 2013 at 7:38 AM, Diego Novillo <dnovi...@google.com> wrote: > On Thu, Nov 28, 2013 at 10:32 AM, Richard Earnshaw <rearn...@arm.com> wrote: > >> I think it might be worth saying that one class of 'obvious' fix that we >> don't want to go in without prior clearance are bulk white space >> clean-ups. These can be a right-royal pain to deal with if you're in >> the middle of a big re-write of a hunk of code. > > Hm, not sure I agree. Those are the most obvious to me. Particularly > after I get my clang format pony. I've asked for GNU style support. > It will be a lot easier to keep files properly formatted to the GNU > guidelines. > > Making exceptions to the obvious rule seems illogical to me.
I have found that using git helps to mitigate the merging pain when the places I am working on have changed at the same time. -- H.J.