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?
September 19th 19 at 12:53
1 answer
September 19th 19 at 12:55
Don't know about Netbeans, but in PhpSrotm you can use the built-in Deployment to synchronize with local folder.

Find more questions by tags GitNetBeansSubversionPhpStorm