How best to setup github repositories

xathras1982
xathras1982 used Ask the Experts™
on
Dear Experts,

I am looking for help and suggestions best practice for setup of your GitHub repo's.
Currently, my team has 1 central repository with multiple branches: master, release, hotfixes and features.

The team has expanded in size from a few people to 10 people and we've recently had a few events that have lead to merges being overwritten and lead to numerous discussions with the team on how they push code.

We have over 70 unique code objects to manage, each an executable that runs on the server from processes, reports, extracts and so on.
A recent idea I had was to break them up into logical feature groups such as:

Sales
Payment Reconciliation
Cash Reconciliation
Reporting[

If you were in my shoes how would you best approach?

Thank you in advance

Wayne
Comment
Watch Question

Do more with

Expert Office
EXPERT OFFICE® is a registered trademark of EXPERTS EXCHANGE®
View Solution Only
Commented:
If your 'code objects' are essentially separate applications they should ideally be in separate repositories. That way a person working on one application would not inadvertently modify another. However, even with them all being in the same repository if you branch and merge correctly you should avoid any code loss. You may also want to introduce the concept of pull requests to your team and maybe have a few 'leads' who will review and merge code so they can make sure nothing funky is happening with the merges and that the correct branching and merging strategy is being followed. Check out the article below for a good start on a solid branching model, which seems to be close to what you are already following.

http://nvie.com/posts/a-successful-git-branching-model/
xathras1982

Author

Commented:
Oh, I remember this. This is exactly where our starting point was :)
xathras1982

Author

Commented:
Thank you for your feedback. Your response is perfect since your URL is exactly the best practice we started with.

It seems that we're in a good place with a start and need to find a best way to implement breaking up of the repos.

Do more with

Expert Office
Submit tech questions to Ask the Experts™ at any time to receive solutions, advice, and new ideas from leading industry professionals.

Start 7-Day Free Trial