Settings and activity
87 results found
-
114 votesSWSBB supported this idea ·
-
9 votesSWSBB shared this idea ·
-
5 votesSWSBB supported this idea ·
-
3 votesSWSBB supported this idea ·
-
60 votesSWSBB supported this idea ·
-
7 votesSWSBB supported this idea ·
-
47 votesSWSBB supported this idea ·
-
14 votesSWSBB supported this idea ·
-
5 votesSWSBB supported this idea ·
-
6 votes
On the release 7.0.16.2077, we added the new server-side merge that extends the existing merge-to functionality.
Using the server-side merge, the file conflicts can be resolved and the merge resolution options (—mergetype, —keepsource & —keepdestination) are supported.
The server-side merge is still on preview so you need to enable it adding the following setting on the client.conf. Check how to do it on the release notes: https://www.plasticscm.com/download/releasenotes/7.0.16.2077
Remarks, the server and client version must be equal or newer than 7.0.16.2077 to use the server-side merge.
We comment option will be documented soon, we already plan a task to do it in the next few weeks. Sorry for the delay.
Best regards
Borja
SWSBB supported this idea · -
14 votesSWSBB supported this idea ·
-
4 votesSWSBB supported this idea ·
-
4 votesSWSBB supported this idea ·
-
33 votesSWSBB shared this idea ·
-
28 votesSWSBB supported this idea ·
-
9 votesSWSBB shared this idea ·
-
7 votesSWSBB supported this idea ·
-
35 votesSWSBB supported this idea ·
-
65 votesSWSBB supported this idea ·
-
6 votesSWSBB supported this idea ·