What is the best way to work with git on multiple branches of a wizard?

Question

I have a git repository for my working project. The software is still under development, but now I have three different "leading" branches with slight variations (graphical settings and other behavior). I cannot automatically combine my development branch with this main branch, because each branch is different. I read about git cherry-pick, but my question is: "Is this the right way to work?" I really need this three different versions of my project, maybe I can try to separate the "core" from the "settings" and work with git suboduele?

thanks

Answer 1

You can use submodules if these options can be isolated in their own subdirectory (since the submodules will be structured in your parent repository: see, for example, “ Layout of the planning repository for git migration ”).
This should be the case for graphic variations.

If these variations are simple differences in the configuration files, you can also use a single branch and a content filter to create the correct configuration file based on the environment in which the repo is checked.

I prefer these cherry pick options that can enter:

• duplication and functional dependencies ,
• functional dependencies