How best to setup github repositories

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
xathras1982Asked:
Who is Participating?

[Product update] Infrastructure Analysis Tool is now available with Business Accounts.Learn More

x
I wear a lot of hats...

"The solutions and answers provided on Experts Exchange have been extremely helpful to me over the last few years. I wear a lot of hats - Developer, Database Administrator, Help Desk, etc., so I know a lot of things but not a lot about one thing. Experts Exchange gives me answers from people who do know a lot about one thing, in a easy to use platform." -Todd S.

dinomixCommented:
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/

Experts Exchange Solution brought to you by

Your issues matter to us.

Facing a tech roadblock? Get the help and guidance you need from experienced professionals who care. Ask your question anytime, anywhere, with no hassle.

Start your 7-day free trial
xathras1982Author Commented:
Oh, I remember this. This is exactly where our starting point was :)
xathras1982Author 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.
It's more than this solution.Get answers and train to solve all your tech problems - anytime, anywhere.Try it for free Edge Out The Competitionfor your dream job with proven skills and certifications.Get started today Stand Outas the employee with proven skills.Start learning today for free Move Your Career Forwardwith certification training in the latest technologies.Start your trial today
Version Control

From novice to tech pro — start learning today.