GitHub Community
MultiSoftwareProject One Repo or More? #22278
-
|
Hey. I’m student right now, and I’d like to make a Software for some Clients. The thing is, the Software should be on Laravel and some parts are identically for every client. But each client will get its own version of this software and some features will be added to everyone. So what do you think, should I make a GitRepo for each client? If I’ve got a Bug, I have to fix on every Repo… Or should I work with Branches in one Repo, what not easily works with Git Flow and I will have many Clientbranches, so it could be hard to manage all of them… Thank you, if you can help me :)… |
Beta Was this translation helpful? Give feedback.
Replies: 2 comments
-
|
Hi @ssgnoe, Welcome to Github Community Forum! The second one is the best one, you need to make sure to use the master branch for the software with the basic features and create branches/versions for every client. If you find a bug in one of the version you can solve in the master branch and once resolved you can merge master in the other branches or even cherry pick the commit where you solve that bug (this work only if the bug is solved in only one commit). Is not easy to do but with a good branch name and version you can do everything. Another way to do what you ask is using submodules: Git-Tools-Submodules, github-gist-submodules, github-blog-working-with-submodules. It is the first method you explained, but with some changes, but maybe is much more easy like this and probably is the better way. Hope to solve your problem 😊 -Gabriele- Mark helpfull posts with Accept as Solution to help other users locate important info. Don’t forget to give Kudos for great contents! |
Beta Was this translation helpful? Give feedback.
-
|
Thank you, you helped me! |
Beta Was this translation helpful? Give feedback.
Hi @ssgnoe,
Welcome to Github Community Forum!
The second one is the best one, you need to make sure to use the master branch for the software with the basic features and create branches/versions for every client. If you find a bug in one of the version you can solve in the master branch and once resolved you can merge master in the other branches or even cherry pick the commit where you solve that bug (this work only if the bug is solved in only one commit). Is not easy to do but with a good branch name and version you can do everything.
Another way to do what you ask is using submodules: Git-Tools-Submodules, github-gist-submodules, github-blog-working-with-submodules. It is the first m…