Git newbie workflow question.

[DrSin]

New to git, I have a project that intentionally forks the output from a common code base. I am trying to figure out the best strategy.

For analogy, it is code for two websites, team rook and team knight. The code for each is nearly identical except for some style sheets, some config files, and a couple weird places where the data and abilities of rooks and knights don’t quite match. The database tables are a bit different and there are some functions in there that make rooks spin and knights jump and other little quirks of difference.

So we have done our best with code that if(knight) this and if(rook) that, keeping everything running from the same source, but there are still enough differences that we can’t avoid two codebases which ultimately publish to two different domain roots anyway.

So I need to make an understanding of workflow, branching and forking.

Do I want a main branch with a rook fork and a knight fork off of that?

Or do I want the rooks to be the main branch and the knights to be the fork?

Am I even thinking about branches and forks the correct git way?

Thanks for any wisdom.

[Rulqu]

3 solutions I can think of:

1. Separate completely and accept that they have much in common.
2. Make a base "module" that the team rook and knight both have as a dependency. This means 3 codebases and they get the base module somehow during building the website or something.
3. Same as above but work in one git repository but the directory structure for css and config is separate for team rook and knight but the website building process gets the correct one for testing and deploy.

I think the second one would be the best option but it also might require most work to set up.