On Mon, Feb 17, 2020 at 10:33:59AM +0100, Bo Berglund wrote: > 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.
If a conflict is already recorded for a file, then it is best to leave it on disk because the resolver may try to do someting with it based on the options chosen by the users. If you had moved the file aside before 'svn update' the conflict would not have appeared in the first place. 'svn status' will show such unversioned files with '?'. > >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. Great, glad it helped :)
