Git-scm , Github

[dcarr]

Originally Posted by bob.wolff68

Tomy,
What do you mean by 'upload code and merge it' ? Git handles merging locally and then uses a concept of 'push' to send the results to the github servers. If you're on Windows, I would suggest that SmartGit is a good tool which integrates nicely with github. It is sometimes confusing, but for the most part is a great tool which is continuing to be improved. It is also free to use for educational use.

GitHub also has their own app for Windows which has a very intuitive interface. However, I have found it buggy in practice. YMMV.