After months of looking, struggling through Git-SVN glitches and letting things roll around in my head, I’ve finally arrived at a web-focused Git workflow that’s simple, flexible and easy to use.
Some key advantages:
* Pushing remote changes automatically updates the live site
* Server-based site edits won’t break history
* Simple, no special commit rules or requirements
* Works with existing sites, no need to redeploy or move files