On Mon, Jun 27, 2016 at 10:29:34AM +0000, Edward Welbourne wrote: > this would bring them to light early and one at a time, which tends to > make them easier to resolve ! > given that mutiple conflicts in the same place are pretty rare, i'll challenge that claim.