[hannesfostie]

We never rebase like that, and instead use git merge master --no-ff

We also never SSH into a server, and instead use Capistrano to handle this for us. Capistrano works great with Rails, but even other frameworks have plugins to handle this. And if you're new to capistrano, take a look at http://capo.io (shameless plug: we built this) for readily available recipes for all kinds of tasks. We use Capo for all our projects, ranging from static sites to jekyll to sinatra, rack and rails apps.

[andyhmltn]

I love capistrano! Sadly, most of the deployment happens on a wordpress theme at the moment.