Approach to use git with two masters

Question

We have two customers (and counting) which share like 80% code of a project, the main differences are like images, config files, and some HTML. There is nothing like a master because without the individual data the project could not run.

What would be the best practice to handle this scenario with git? Is it possible to use git flow somehow?

Currently, we just have 4 branches:

customer1_dev -> customer1_master

customer2_dev -> customer2_master

We are Cherry-picking most of the commits between those.

Answer 1

In this case, the solution is to branch from a common code-base and keep separate branches for each customer. Then when you want to release for a particular customer switch to their branch and do "git merge master". this will change the mainline into a customer-specific branch.

You can even do "rebase". Using any of these in the customer branch will provide a good workflow for your situation.

For more information on Git, you can join git training.