From: Enrico Weigelt Date: Sat, 27 Oct 2012 18:45:45 GMT Subject: Re: Workflow for templates? Message-ID: <3190de06-2eaf-4a39-91aa-9cc34c20fc8e@zcs> In-Reply-To: <20121025211522.GA28437@raven.wolf.lan> Hi, I'd suggest a 3 level branch hierachy (IOW: the lower level is rebased ontop of the next higher level): * #0: upstream branch * #1: generic local maintenance branch * #2: per-instance cutomization branches Normal additions go to the lowest level #2. When you've got some generic commit, you propagate it to the next level (cherry-pick) and rebase layer #2 ontop of it. Now you can send your layer #1 to upstream for integration. When upstream updated his branch, you simply rebase #1 ontop of it, do your checks etc, then proceed to rebasing #3. You could also introduce more intermediate layers (eg when you've got different groups of similar instance that share certain changes) cu -- Mit freundlichen Grüßen / Kind regards Enrico Weigelt VNC - Virtual Network Consult GmbH Head Of Development Pariser Platz 4a, D-10117 Berlin Tel.: +49 (30) 3464615-20 Fax: +49 (30) 3464615-59 enrico.weigelt@vnc.biz; www.vnc.de