[Development] commas in ctor-init-lists

Thiago Macieira thiago.macieira at intel.com
Fri Jun 3 15:03:52 CEST 2016


On sexta-feira, 3 de junho de 2016 12:58:01 BRT Edward Welbourne wrote:
> Right - the "always add at end => always get conflict on merge"

You get conflict on merge if it was within three lines of the other change, 
regardless of where the commas were.

-- 
Thiago Macieira - thiago.macieira (AT) intel.com
  Software Architect - Intel Open Source Technology Center




More information about the Development mailing list