From: Jonathan Nieder Date: Wed, 21 Jul 2010 17:09:38 GMT Subject: Re: Handling multiple parallel versions. Message-ID: <20100721170938.GA14177@burratino> In-Reply-To: <4C471223.9050303@ianhobson.co.uk> Ian Hobson wrote: > So this solution is NOT working for maintaining parallel versions. [...] > re-applying the differences between each version (they are a set > of images and a config file). Okay, now that I’ve gotten that rebasing rant out of my system: I suspect the best thing would be to track the branding and configuration file separately from the main source tree. See http://thread.gmane.org/gmane.comp.version-control.git/146084/focus=146097 for hints. (sorry for the noise) Jonathan