Re: Only the config file changes ...

From: Michael J Gruber <git@drmicha.warpmail.net>
Date: Mar 2, 2010, 14:46 UTC
Message-ID: <4B8D24DB.3080007@drmicha.warpmail.net>
In-Reply-To: <1463530E-F729-46CA-881D-A89E6CF89241@me.com>

Jez Caudle venit, vidit, dixit 02.03.2010 14:26:

> Sounds good.
> 
> The only problem being I find a bug in version C. I fix it in version
> C,

Don't do that :)

> now I want to merge that change back to the master and then out to
> A,B and then D.
>

If you've done that anyways, you can still cherry-pick that change onto master, or merge --no-commit and checkout --ours what you don't want merged.

Show 8 quoted lines

> 
> I'm still reading my Git book but I'm thinking of doing it this way:
> 
> Master has it's own repository. Each version has it's own repository
> that is created by cloning the Master and then removing all the files
> that are not specific removed from the repository. When changes are
> made to the master then simply copy all the non-specific files to
> each of the versions.

I don't think you need to remove any files - you do need them for testing, don't you? It's just that you don't want to modify them in your "specific" client repos.

Michael