Svn talks about conflict, but it does merge (TortoiseSVN)

Question

Recently, I have seen behavior when after updating svn shows certain files as “conflicting”, but when I try to edit conflicts, they are not there (the “Next conflict” and “previous conflict” buttons are disabled, and if I view the file, none of lines are not marked in red).

It seems to have started after I started working from a different repository than what I worked for, but I'm not sure if this is related.

Answer 1

You can use svn resolved to remove conflict markers if they are there by mistake.

resolved : remove the conflicted state in the working files or directories. usage: resolved PATH...

Note: this subcommand does not semantically resolve conflicts or remove conflict markers; it simply eliminates the conflict-related artifact files and allows PATH to be committed again.

Answer 2

Go to options in TortoiseMerge and make sure

• you don't ignore eols
• You do not ignore spaces.

I am sure that the conflict exists either in eols or in whitespaces.