Making your branches smaller for easier merges

Diego Novillo dnovillo@redhat.com
Wed Sep 27 20:54:00 GMT 2006


Daniel Berlin wrote on 09/27/06 16:37:

> If you are just writing a new pass, you can probably get away with
> branching only a few files, and switching those may be a lot better
> strategy than branching the entire trunk tree branch to modify 6 files
> in the gcc dir.
>
But this means that I'm at the mercy of mainline random breakage, right?
 Most of the time I would rather do controlled merges when I know
mainline is in a usable state.



More information about the Gcc-patches mailing list