Jez Caudle venit, vidit, dixit 02.03.2010 14:26: > Sounds good. > > The only problem being I find a bug in version C. I fix it in version > C, Don't do that :) > now I want to merge that change back to the master and then out to > A,B and then D. > If you've done that anyways, you can still cherry-pick that change onto master, or merge --no-commit and checkout --ours what you don't want merged. > > I'm still reading my Git book but I'm thinking of doing it this way: > > Master has it's own repository. Each version has it's own repository > that is created by cloning the Master and then removing all the files > that are not specific removed from the repository. When changes are > made to the master then simply copy all the non-specific files to > each of the versions. I don't think you need to remove any files - you do need them for testing, don't you? It's just that you don't want to modify them in your "specific" client repos. Michael -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html