Find changed files in workspace before merge ?

[tony707]

Hi,

I just saw the new config option (Find changed files in workspace before merge) has been added in Plastic preferences
but I'm not able to find in the documentation (https://www.plasticscm.com/documentation/gui/plastic-scm-version-control-gui-guide.shtml#TheOtherOptionsTab)
what it is supposed to do and in what context.

Could you explain why we should use it or not ? 

 

Thank you,

[manu]

Hello Tony,

we recently added this preference because we started having more and more requests from new customers asking for it.

The preference will prevent issues with newcomers and the "undo changes" operation after a merge. Imagine you have the a file "foo.c" changed, you start a merge operation where the "foo.c" files is a merge candidate (it was changed by a coworker as well), at the end of the merge operation you can't easily undo just the changes brought by the merge operation, this will prevent pain for rookies.