No-ticket: fixed rebase issue. We first prepared a patch file of all the post-disaster changes we wished to keep. We checked out the last pre-disaster version and also the head of V2_dev. Then we copied all the files APART FROM .git from the pre-disaster version into the head version and applied the patch. Then committed and went to the pub.