On 17 July 2010 11:37, Alexander Klenin wrote: > I just wanted to say that, in SVN, there is indeed a problem as soon as > conflicts start to accumulate, so (in my experience) the optimal way > is to avoid them > as much as possible by avoiding feature branches with a lifetime of > more than a few days.
I can't comment on SubVersion, but with Git I have feature branches that live for a couple of months before they get merged. I have no problems with that. So maybe it's down to the way SVN is used? I don't know. All I can say (which applies to all VCSes), is that not all features (and thus feature branches) can be implemented and tested in a few days. -- Regards, - Graeme - _______________________________________________ fpGUI - a cross-platform Free Pascal GUI toolkit http://opensoft.homeip.net/fpgui/ _______________________________________________ fpc-devel maillist - [email protected] http://lists.freepascal.org/mailman/listinfo/fpc-devel
