I have a git repo for my work project. The software is still under development but i have now three different branch "master" each with some little variations (graphical customization and different behaviour). I cannot merge automatically my development branch with these master branch, because every branch is differnet. I read about git cherry-pick but my question is: "is this the right way to work?" I really need this three different version of my project, maybe can i try to separate the "core" with the "customization" and works with git submoduele?
thanks