ergoback/howtonode.org — pull request #4 by XULRunner42 (2012-02-27 02:50:26+00:00)
Title: Edits

I am putting my changes in the "edits" branch, where they can be picked up automatically on the server.

You don't need to worry about branches. You have only one branch, "master", and you should always be able to push commits to it. The server will pick them up automatically every 10 minutes, and they will go live.

Review/accept and pull my changes (remember green button, blue merge) here at Github, then use `Pull` on TortoiseGit to make sure that your local copy has the latest changes. You should always be able to push to your master branch, even if you don't have the latest changes from me, there is just a chance that there will be a merge conflict on the server when you try to edit a file that I've also edited, and already pushed to the server.

(You will have to try this pushing/pulling for a while to get the hang of it, I'm sure. It's not too tricky, and it's pretty bullet-proof.)