[Subclipse-users] Files which never merge properly

I am maintaining two branches of code. At some point, months ago, I
moved files from one directory to another. Something got screwed up, I
don't remember what it was.

At any rate, whenever I do a merge between these two branches, these
files, which are identical both in content and location (in the new
directory) between the two branches show up as needing to be checked
into SVN on the branch into which the merge was done, in spite of no
changes being present. I have tried everything to make this go away,
but I cannot. I always include them in my commits and they always
return the next time I do a merge. It's not a show-stopper but it is an
annoyance. How can I get rid of it?

------------------------------------------------------
http://subclipse.tigris.org/ds/viewMessage.do?dsForumId=1047&dsMessageId=2391041

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subclipse.tigris.org].
Received on 2009-09-04 18:18:08 CEST