Update Your Working Copy With Changes From Others

Hi,

I am using tortoisesvn 1.4.5 client (on windows xp).

In case of any conflicts during an update, the dialog shows the conflicting
files in red.

I can double click on the line and invoke merge tool to resolve the
conflict.

If the changes from other user do not conflict (i.e. it's in different line
of code

from my changes), the tortoisesvn 'automatically' merges those changes.

Now the question is:

-------------------------------

Is there any update option that allows 'manual' merge in case of
non-conflicting

file updates?

In other words, I want the merge tool to be invoked similar to conflicting
scenario;

even in case of non-conflicting update (changes from other user are in
different lines than mine)?

Thanks & Regards,

Tanmay Pradhan

Exilant Consulting Pvt Ltd

INDIA

 
Received on Fri Oct 26 12:00:48 2007