In my company, we have been using git for several months (and we are glad about it), but we still do not get git for 100%.
Our main product is a website that we offer in different languages (frontend + admin backend). Some of these websites offer features that others should not offer (for example, the type of fields to be filled in this form, different rules for validation rules, etc.).
Since these differences are quite small, we now use the configuration file to determine whether certain elements should be used by the website. But I think this will cause problems when the differences between sites become larger.
I assume that using different branches will simplify the work, but how do you support different branches with one common core? We do not yet use a deployment tool, for example, Capistrano (but we plan to do it), so endless manual collection of cherries from the master to all different branches is currently not an option.
So, given this setting, how do branches help us?
master
|
- english
|
- german
|
- french
(For clarification: this is not about l10n / i18n, but about sharing the main functions between the branches)
source
share