Git

Some ideas regarding using git effectively:

Here’s how I have started using branches in my workflow for this website:

I push to the test server, fix, push, repeat. Then push to live.

Easy peasy.