I'm working in a couple of websites, both websites needs almost the same code except for some changes in images and css, or settings.
I'm just finished to read the chapter of branchs of Pro Git book and i'm a bit confused, if a branch is not the best solution for this problem, is a fork?
I mean, we have instances A and B of the code, between A and B, the differences are things likes css colors, urls, api keys, but most of the code is the same, so in what way I can deal with this, i need something like code in A and then 'patch' it to get B, but i'm not sure how make a merge that doesn't overrides images...
Anyway, if is a branch or a fork, how can I make a merge for new features in A without lost changes in B?