Re: How to resolve between working copies?

2020-02-17 Thread Stefan Sperling
On Mon, Feb 17, 2020 at 10:33:59AM +0100, Bo Berglund wrote: > On Mon, 17 Feb 2020 10:10:53 +0100, Stefan Sperling > wrote: > > >> So what can I do to get rid of this problem? > > > >First, you should put the file back on disk :) > >Moving files away behind the back of SVN is never a good idea.

Re: How to resolve between working copies?

2020-02-17 Thread Bo Berglund
On Mon, 17 Feb 2020 10:10:53 +0100, Stefan Sperling wrote: >> So what can I do to get rid of this problem? > >First, you should put the file back on disk :) >Moving files away behind the back of SVN is never a good idea. Yes, but the file was a non-versioned duplicate so it should not matter

Re: How to resolve between working copies?

2020-02-17 Thread Stefan Sperling
On Mon, Feb 17, 2020 at 10:04:46AM +0100, Bo Berglund wrote: > I have a project I am working on in both Windows and Linux. > So the project is checked out on both places. > Now I have a php file that was created in the Windows WC and copied to the > Linux WC > where its functions were tested on

How to resolve between working copies?

2020-02-17 Thread Bo Berglund
I have a project I am working on in both Windows and Linux. So the project is checked out on both places. Now I have a php file that was created in the Windows WC and copied to the Linux WC where its functions were tested on Apache after copying over to the website. Then I svn added it in the