SVN Tortoise - merge files

[matejdro]

Im doint some costumization to dolphins code but now i still wants to keep code up to date.

Is there any way to make tortoise merge changes on SVN with my changes or at least warn that there is updated version of modified file on SVN?

[James333]

every time you checkout Tortoise automatically merges the modified files ( and tells you if there is a conflict )

[matejdro]

Yes checkout, but what about rigth click --> update ?

[James333]

(02-16-2010, 10:35 AM)matejdro Wrote: Yes checkout, but what about rigth click --> update ?

works in the same way