svn says conflicted but it's really merged (TortoiseSVN)
- by JoelFan
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.