How to make a fusion of two local projects in Netbeans or phpSrotm?
There are two website on a local server, on one engine. One worker, the second for development and testing of new functionality.
Here is the second edited some files and added new. How do I merge the two project?