View Single Post
  #2   Spotlight this post!  
Unread 09-12-2012, 16:32
BigJ BigJ is offline
Registered User
AKA: Josh P.
FRC #1675 (Ultimate Protection Squad)
Team Role: Engineer
 
Join Date: Jan 2007
Rookie Year: 2007
Location: Milwaukee, WI
Posts: 947
BigJ has a reputation beyond reputeBigJ has a reputation beyond reputeBigJ has a reputation beyond reputeBigJ has a reputation beyond reputeBigJ has a reputation beyond reputeBigJ has a reputation beyond reputeBigJ has a reputation beyond reputeBigJ has a reputation beyond reputeBigJ has a reputation beyond reputeBigJ has a reputation beyond reputeBigJ has a reputation beyond repute
Re: Git-scm , Github

Quote:
Originally Posted by tomy View Post
I'm just curious because my team wants to use a version share server. With github all they would have to do is pull down the code and upload when they are done right? If that is true then who/what manages the merges or the back ups?
Git is a distributed version control system. A common workflow is to have one repository that acts as the common "server" which you keep on github. However, anyone that participates clones the repository and has a full copy of the repository on their machine. They make changes and commit them to their own repository. Before joining the "server" code one fetches the latest updates from the server to solve any conflicting merge issues, then "pushes" their changes to the server. Depending on your setup different users can have push rights, or may be required to make a pull request for an administrator to pull the changes into the server repository.
Reply With Quote