On Mon, 17 Feb 2020 10:10:53 +0100, Stefan Sperling <s...@elego.de> 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 that I renamed it, right. Anyway I put it back since it did not solve my problem. >Then run 'svn resolve' again. When you are unsure what to choose, the option >to "merge" the files should be the best one. It will boil down 'add vs add' >to a text-conflict or perhaps even a clean merge, depending on file content. I have never even seen the resolve command before... >There are more options (try the 'h' option to see them), but generally >any "merge" options in the conflict resolver will always produce a useful >result when possible. > >Hope this helps! Yes it does, thank you! Running svn resolve got me a chance to fix the problem. Since I could not see any difference in the command line svn diff I proceeded to merge etc and then I used tortoise to diff the result and found that tywo lines had an extra space at the end, something WinDiff does not consider a difference... Now I could finally svn rm the file since it did not belong there in the first place, moved into a php dir instead. -- Bo Berglund Developer in Sweden
