Push and pull changes
In an simplified way, just do git push and git pull. Changes are merged and if there's a conflict git will let you know and you can resolve it manually.
When you first push to a remote repository you need to do a git push origin master (master being the master branch). From then on you just do the git push.
Push tags with git push --tags.
