Making your branches smaller for easier merges
Paul Brook
paul@codesourcery.com
Wed Sep 27 21:08:00 GMT 2006
On Wednesday 27 September 2006 21:37, Daniel Berlin wrote:
> I see occasional complaints about the size of mainline merges to
> branches Most people working on branches are only modifying a very
> small subset of the files that are in mainline, and certainly not the
> entire trunk tree.
I'm kinda surprised this is still a problem.
With svn even big merges should be fairly quick, and if you're only modifying
a small part of the tree then everything else should merge without conflicts.
Am I missing something?
Paul
More information about the Gcc
mailing list