Re: Only the config file changes ...

From: Michael J Gruber <git@drmicha.warpmail.net>
Date: Mar 2, 2010, 13:16 UTC
Message-ID: <4B8D0FA7.8070206@drmicha.warpmail.net>
In-Reply-To: <70786312428882320720829319256948501508-Webmail@me.com>

Jez Caudle venit, vidit, dixit 02.03.2010 13:06:

Show 15 quoted lines

> Hi I'm new to Git and I've read the manual and tried my best to
> understand it.
> 
> I have a project that is going to have many versions, all the same
> except for the config file, the unit/functional tests and some
> display information.
> 
> I have seen that I can create branches and then merge them. I
> wondered if I could create a branch, change the config file
> information and then decree that the config file in the new branch is
> not merged.
> 
> I read about sub modules but they didn't seam relevant.
> 
> Am I barking up the wrong tree here?

You're fellow dogs may need more details in order to decide that ;)

In general, I would recommend one branch (be it master) for changes which apply to all clients (I guess that's what you mean by "versions, all the same except..."), and one branch each for specific changes (to config etc.).

Then just make sure to merge in the right direction, i.e. merge the general, common branch into the specific ones.

Cheers, Michael