git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jonathan Nieder <jrnieder@gmail.com>
To: Ian Hobson <ian@ianhobson.co.uk>
Cc: git@vger.kernel.org
Subject: Re: Handling multiple parallel versions.
Date: Wed, 21 Jul 2010 12:09:38 -0500	[thread overview]
Message-ID: <20100721170938.GA14177@burratino> (raw)
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

      parent reply	other threads:[~2010-07-21 17:10 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-07-21 15:28 Handling multiple parallel versions Ian Hobson
2010-07-21 16:59 ` Jonathan Nieder
2010-07-21 17:09 ` Jonathan Nieder [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100721170938.GA14177@burratino \
    --to=jrnieder@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=ian@ianhobson.co.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).