SVN update and conflict

Hi,

In our company we get code from offshore team and we have couple of developers working here too. Every day the code from offshore will be replaced(copy the folders and replace them) by an onsite person first at his local copy which will show as modified in SVN.
When he tries to update before committing his changes as there are some changes made by the developers here as well it doesn't update and when he tries to commit assuming it will show conflict message it just overrides. We even checked if its merging the changes but it's not.
We are having problems when we are copying and replacing files otherwise works fine as its suppose to.

My questions here are:

1. Are we following wrong procedure of copying and pasting files and updating?

2. Is there any better way to do this?

3. Why doesn't it update or show some kind of conflict ?

Thank you,

Deepthi
Received on 2014-06-04 16:33:47 CEST