On Wed, Sep 24, 2008 at 03:40:14PM +0100, Tom Schutzer-Weissmann wrote: > Could we use git, or a tool based on git, to change on the development > branch and selectively apply changes to the other branches - is it as > simple as using git cherry-pick? If I am understanding your description of the problem correctly, then yes, it is as simple as cherry-picking. If your branches have a strict hierarchy, you can also use a "merge up" workflow where some branches always contain all of other branches. For example, in git has a "maint" branch for stable bugfixes and a "master" branch for general development. The rule is that one must always merge "up", meaning that master can merge from maint, but maint can never merge from master. Stable bugfixes go on maint, and then get to master by merging. Depending on the details of your branches, something like that may work for you. You can have a "base" branch that all product branches merge from, and only changes which should affect all products go on that branch (or on topic branches that are based on the "base" branch). -Peff -- 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
