After building/testing a Drupal 7 site, I deployed it to prod server, exporting all views as features. Now the views are all 'in database' on test site, but 'in code' on live site - on the theory that no views editing should be done in prod. Now if I want to copy my prod database (but not code) back to my testing site for a new phase of development, what's the best way to avoid overwriting (or wiping out) views 'in database' on my dev site?
Should I have renamed the views when creating features?
do I export/import the views, either from/to testing or from prod to testing?
is there some other way to selectively preserve views in the testing db when copying back an sqldump?