> The idea is that each developer maintains a base branch, all > dependencies are merged into that base branch > and all their work is performed ontop of that base. As the work is > stabilised, it is rebased onto topic branches based > on well known tags and these topics are then published. The basic > ideas is always merge into the _base_ of the working branch > , never merge into the _tip_ and never publish the tip of the working branch. > A key point I missed here that is worth emphasising - as work is rebased from the tip of the working branch onto stable topics that are then published, the topics are then re-merged into the _base_ of the working branch as well. This is very important - it keeps the working tree stable, while keeping the topic branches clean. > jon. > -- 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