Take the 2-minute tour ×
Programmers Stack Exchange is a question and answer site for professional programmers interested in conceptual questions about software development. It's 100% free, no registration required.

I'm very new to GIT/GitHub (as new as starting yesterday). I would like to know what is the best way to manage multiple people working on the same project with Github. Currently I'm managing one project with four developers.

  1. How do I go about the workflow and making sure everything is in sync?

    (Note: All developers will have one universal account.)

  2. Does each developer need to be on a different branch?

  3. Will I be able to handle 2 people working on the same file?

Please post a detailed answer, I'm not a shy reader. I need to understand this well.

share|improve this question
add comment

3 Answers

up vote 7 down vote accepted

If all of the developers have committ access to the repo, you should not need to do anything special. They will pull changes from the repo, make their own changes, commit locally, and then push back into the public repo when they have something working.

If on the other hand you have one (or a few) developer(s) responible for commiting to the repo, and the others are providing patches to these. Have each of them clone the repo into their own accounts and have them send pull-requests when they have a change they want into the main repo.

It's also possible to make specific clones for working on specific features if you wish. Using the same workflow with pull-requests to get changes into the main repo when the feature is done.

If by "All developers will have one universal account" you mean that all developers will share one github account and appear as the same committer in the repo, that's a bad idea. Make separate accounts and set them up as collaborators if you want them all to have committ access.

As for your specific questions:

  1. No, use branches for features, fixes etc that will take more than one commit. More than one developer can be working on the same branch.

  2. Yes, git handles conflicts really well, so there's no problems having people work on the same file. No problems except, conflict resolution may not always be trivial if there's fundamental changes to a file that has been edited by more than one member. This is however nothing that can not be overcome by talking together. Version control does not replace communication.

Good luck!

share|improve this answer
    
A couple of points you've made there are real eye-openers, got me to think in a different direction all together, thanks ! –  badZoke Jul 12 '12 at 10:03
    
Hapy if it can help you. Git and DVCS's require some getting used to, but they're extremely flexible once you get used to them. –  harald Jul 12 '12 at 10:09
    
Thanks for this. I had one specific question. If there are multiple developers working on the same branch. Every single time one of the developers makes changes and pushes to the working branch, does the rest of the developers need to pull the changes(to make sure they have the latest code locally to work on) ? –  Eswar Rajesh Pinapala Jul 19 '13 at 4:11
    
No, not every single time, just when you want to sync up. Consider your local copy of the branch as your private branch, and the upstream branch as the one you want to merge into. Using something like git fetch upstream followed by git merge upstream/branch should get you synced without rewriting your local commit history. If that's not an issue, just simply git pull --rebase will move your local unpushed changes onto the top of the upstream branch. –  harald Jul 19 '13 at 12:40
add comment

We work with 2 developers and we use this workflow:

  • On Github we have a master branch and a dev branch
  • The master branch is the same as production or contains deployment ready code
  • The dev branch is ahead of master and contains all new code currently being worked on
  • Locally we both work on the dev branch and push to github when something is ready
  • The other dev fetches any new changes from the dev branch before pushing his new code
  • When dev branch is good,we merge with the master branch
  • Locally we have several feature branches issue branches etc.
share|improve this answer
    
Nice and simple, thanks a lot ! I'll start with this, before I move into the complex stuff ;) –  badZoke Jul 12 '12 at 11:42
add comment

I think all your answers are on here and here

For workflow see this

share|improve this answer
add comment

Your Answer

 
discard

By posting your answer, you agree to the privacy policy and terms of service.

Not the answer you're looking for? Browse other questions tagged or ask your own question.