Merging the code bases right before deploying to StagingFinal is a very bad idea. You now basically have a completely untested code base in StagingFinal, because you can't predict how the changes of the two partners might interact.
To remedy this problem, either introduce a "DevServerFinal" or merge the code bases before each partner deploys to their DevServer.