We use this script to automatically merge all features into staging and re-merge those features with deploy-ed code. It will stop when there is a merge conflict -> resolve and start it again.
often -> smaller conflicts.
no thinking/typing -> less mistakes/headaches.
e.g. store it in scripts folder or turn it into a rake task