I plan to use git for hosting my projects on my server.
What do I need to set up on the server, to push my files onto it. And when the files on the server are newer as the files on my computer, how do I merge them?
Also, I use, say, two computers where I develop. How do I merge from one computer to the other?
Also, when two people are working on the same project, how do they merge their local repos from one another?
As you probably can tell by now, I come from SVN, but I've worked with Mercurial and now I'd like to test git.