Sounds like you are trepid about merging design work with your PHP code?
When setting up a web project, you should have at least three machines for your work.
- One server should be a production server where your final work is publicly made available. This machine is typically a leased machine or hosted on a web hosting company.
- Another server should be located in-house and is a development server.
- Another computer should be your workstation that uploads files to the development server.
All machines need to be networked together.
Development Server
(apache, mysql, php)
| |
| |
| |
intranet internet
| |
| |
Development box Production Server
(text editor, (apache, mysql, php)
photoshop, browser)
On your development machine, backup all your and his work in separate files. Merge his work with yours. Then upload it to the development server and test.
This way if you screw up, you can rollback to the original state.