Non-Distributed Version Control Systems keep both changes

Created July 19, 2018 13:12

Hi,

Say, for example I'm working on a remote file in PhpStorm and there were some changes made by someone else to that file. When uploading my version of the file a conflict pops-up and PhpStorm gives you the option to either except remote changes and erase yours, or keep your changes and erase remote ones.

Is there a possibility to keep both changes - i.e. merge everything in one file?

Thanks.

1 comment

Andriy Bazanov

Created July 19, 2018 17:10

Hi there,

What's your upload settings?
Can you somehow cancel/skip that file upload and then use "Deployment | Compare with Deployed ..." (or even "Sync with Deployed ...") where you can merge them into your local file first which you then upload with overwriting remote one?

Anyway: with these deployment options IDE should offer some additional choices.

So I'm editing local file and then uploading to remote (it's different to your remote editing where you basically do not wish to keep local copy ... but still). And with that option set to other than "No" I do see this kind of popup (see below) where I can merge and upload straight away (or cancel and do it manually as described earlier).

P.S. I'm not sure if any of those mentioned earlier is applicable to Remote Edit (not using it myself) where you basically do not have local copy (well, technically you have, but it's stored outside of the project and not treated as belonging to this project; more like a temp file).

Please sign in to leave a comment.