[pcowans]

This doesn't seem that bad to me, what problems is it causing?

The only changes I'd make would be to wrap it up in a script so you have one-click deploys, and possibly implement the 'copy and symlink' strategy that Capistrano uses so you have minimal downtime during deploys and instant roll-backs if necessary.

[andyhmltn]

It isn't causing any problems! But in a recent thread on git deployment, there was a tonne of hate for this method

[pcowans]

... one other thing though. With a bit of practice you can remove the need to develop on feature branches; break things down into really small chunks and get into the habit of making half-done features unobtrusive (e.g. hiding UI elements until they're ready). That way you can push to master often and have confidence it'll always be safe to deploy, which simplifies your tooling and reduces the scope for merge conflicts etc.

[andyhmltn]

I personally find branching a lot better than the method you described. Master is always safe to deploy in my current setup and I don't usually get merge conflicts :-)

[pcowans]

Don't worry about it then - there are more important things to spend your time doing.