On Tue, Aug 7, 2012 at 9:08 AM, Alex Harui <aha...@adobe.com> wrote: > ...IIRC, merging worked pretty well for us. I am currently not afraid of it, > especially since we are using SVN 1.6....
>From the community standpoint, I think working in the same trunk as much as possible is much better, in general. Even if branching/merging is not a problem from the technical point of view, IMO branches should be as short lived as possible, and only created when really needed. Long-lived branches can create much technical and community friction IMO, and learning to work in small reversible steps that don't hurt other's code can help the overall project velocity a lot. -Bertrand
