How to merge two local projects in Netbeans or phpSrotm?

V

Vasily G.2015-02-27 14:42:58

git

Vasily G., 2015-02-27 14:42:58

There are two sites on the local server, on the same engine. One is working, the second is for developing and testing new functionality.
Here on the second I edited some files, added new ones. How can I merge these two projects?

Reply

Answer the question

In order to leave comments, you need to log in

2 answer(s)

Y

yiiworld, 2018-10-31
@hebrian_vasyl

You probably need to understand the basics of GIT (Distributed Version Control System).
In particular with Branching and Merging (branches) - to control the change.
And with ways to get the right version in the right place (git clone, git fetch, git checkout). In rare cases where there is no access to the central git repository, the "Patch Workflow" approach can be used.

S

Sergey Novikov, 2015-02-27
@BOOMER_74

I don’t know about Netbeans, but in PhpSrotm you can use the built-in Deployment to synchronize with a local folder.