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 pull is 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, push has 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
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With