how to merge cloned git repository with the original repository

Question

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 ?

Solution 1

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

Solution 2

Simply have each developer push to the main repository. Git is smart enough to merge them, most of the time.

$ git add .
$ git commit -m 'committing my changes'
$ git push origin master

---

Since git push does not merge, you could have each developer push to a branch on the central repository, and then when you're ready, log on to the machine that hosts the central repo, and merge them with git pull . <branch-name>. Just make sure git branch displays an asterisk next to the master branch before merging.