CODEWITHSUNDEEP
svnversion-controltortoisesvn
JoelFan
JoelFan

Reputation: 38724

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

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.

Upvotes: 4

Views: 613

Answers (2)

Stefan
Stefan

Reputation: 43575

Go to the options in TortoiseMerge and make sure that

  • you don't ignore eols
  • you don't ignore any whitespaces

I'm pretty sure the conflict exists in either eols or whitespaces.

Upvotes: 1

John Kugelman
John Kugelman

Reputation: 362037

You can use svn resolved to remove the conflict markers if they're there in error.

resolved: Remove 'conflicted' state on working copy files or directories.
usage: resolved PATH...

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

Upvotes: 2

Related Questions