svn says conflicted but it's really merged (TortoiseSVN)

Posted by JoelFan on Stack Overflow See other posts from Stack Overflow or by JoelFan
Published on 2010-02-25T22:36:37Z Indexed on 2010/04/01 3:33 UTC
Read the original article Hit count: 258

Filed under:
|
|

Lately I've been seeing behavior where after an update svn shows certain files as "conflicted" but when I try to edit the conflicts, there are none (The "next conflict" and "previous conflict" buttons are disabled and if I scroll through the file, none of the lines are marked red).

This seems to have started after I started working from a different repository than I had been working with, but I'm not sure if that's related.

© Stack Overflow or respective owner

Related posts about svn

Related posts about tortoisesvn