Re: SVN update and conflict

2014-06-04 Thread Andy Levy
On Wed, Jun 4, 2014 at 10:25 AM, Deepthi Pentyala wrote: > 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

Re: SVN update and conflict

2014-06-04 Thread Eric Johnson
A little difficult to figure out from your wording exactly what you're doing. I would suggest that rather than sending just the code to the offshore team, send a zip of a working copy (assuming they're on the same platform). Offshore developers should use commands like "svn delete", "svn move", an

SVN update and conflict

2014-06-04 Thread Deepthi Pentyala
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 befo