conflict error? where is it?

[Fluffle Puff]

how can I fix it? thanks

[Brian]

/db/item_db.txt is marked with a 'C'.

I think it's a Tree Conflicted because it was SVN Moved in r15394 for the /db/ folder restructuring in r15390. I'm not sure how to mark it Resolved in Linux, but it would be something like this:

- save a copy of your old /db/item_db.txt (like save it on your computer)

- resolve the conflict

- then upload your item_db.txt to /db/pre-re/ or /db/re/ depending on if you're using Renewal or not.

[Fluffle Puff]

thanks Brian.

then, I should not have a item_db.txt in my db/ folder, should have it? I have to move it to /db/pre-re/, right?

thanks sweetie

Edited January 5, 2012 by Alejandra

[Lighta]

Otherwise the cli solution is :

svn resolve --accept theirs-conflit path/to/your/folder/or/file //will take svn version conflit

svn resolve --accept mine-conflit path/to/your/folder/or/file //will take your version conflit

svn resolve --accept theirs-full path/to/your/folder/or/file //will take svn version (all file)

svn resolve --accept mine-full path/to/your/folder/or/file //will take your version (all file)

That should be the main one. More option could be found on svn help resolve.