we are using git on a lan of computers and we have a central repository on one machine, every developer has to clone the repository and work on his one machine. but how to merge all this repositories together in the central repository ?
Share
Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
we are using git on a lan of computers and we have a central repository on one machine, every developer has to clone the repository and work on his one machine. but how to merge all this repositories together in the central repository ?
Short version:
git pullis the equivalent of fetch + merge. You can — by default — only push “fast forward” changes, which means you’ve either merged or rebased your uncommitted changes. Contrary to what Blaine suggests,pushhas nothing to do with merging.Longer version: You seem to not understand quite how Git works. As source control is an integral part of software development and you’re using it, I suggest you read up on how Git’s data model works — and how to implement various workflows with it. Excellent source: http://git-scm.com/documentation