Exact problem we've run into at work. We've ended up having to write external merge coordination in order to not break our dev deployments.