On 01/17/2011 05:20 PM, quem tu quiseres wrote: > Any hints are appreciated. > Thanks, > John The "dirty and easy" way: delete lines with >>>>> or <<<< (they are old diffs) and comment the targets that don't compile. Base apps work this way. Anyway Sylvain is right: a testing branch isn't expected to compile as the trunk should :).