On Wed, Mar 23, 2011 at 5:37 PM, Steve Cohen <sco...@javactivity.org> wrote: > Somewhere back in the distant past, I was a bad bad boy and did something > that SVN didn't like to get some merge to work. This happened about two > years ago. > > Since then, these files are picked up for properties merges whenever I merge > their project even though they haven't really changed in years. How can I > FIX this merge info so I stop being bothered by them. > > This is really annoying.
Wouldn't "svn revert filename" clear this? Or did you want to keep your changes?
