Earlier this year I built a client a large website for their organization. After that site was finished and live on the web (not on our development server anymore) they wanted the company I work for to build them another site for their online magazine. I built the site using a copy of the old development site we used for their org since they wanted everything to look the same. Now that the site is finished, we need to integrate the two together (so, basically, the online magazine is actually a new page on their live site).
The client has been making edits to the live site, so they sent us over their updated MySQL database and a zip file of the entire org site. I loaded everything onto our dev server, integrated the pages, and it seems to be working together pretty well. HOWEVER, I'm missing pages on my dev site that should be there (like the designed Home page), settings made to the template, etc. I also tried importing their DB to overwrite my dev DB, but it doesn't seem like the DB has the drop tables line, so it won't overwrite. How can I get the homepage copied over the way it should be? How can I copy over settings from the live site's zip file so the dev site and the live site look the same? And what would be my best course of action for importing the live site's DB and/or merging it with the dev site DB?
To clarify, this is my first time ever trying to merge sites and data, so I don't really know what I'm doing.