Header in post-receive
Pre and post deploy scripts along with a testing procedure
Merge conflictsin post-receive