Fluffle Puff Posted January 5, 2012 Group: Members Topic Count: 29 Topics Per Day: 0.01 Content Count: 375 Reputation: 88 Joined: 12/30/11 Last Seen: May 3, 2016 Share Posted January 5, 2012 how can I fix it? thanks Quote Link to comment Share on other sites More sharing options...
Brian Posted January 5, 2012 Group: Members Topic Count: 75 Topics Per Day: 0.02 Content Count: 2223 Reputation: 593 Joined: 10/26/11 Last Seen: June 2, 2018 Share Posted January 5, 2012 /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. 2 Quote Link to comment Share on other sites More sharing options...
Fluffle Puff Posted January 5, 2012 Group: Members Topic Count: 29 Topics Per Day: 0.01 Content Count: 375 Reputation: 88 Joined: 12/30/11 Last Seen: May 3, 2016 Author Share Posted January 5, 2012 (edited) 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 Quote Link to comment Share on other sites More sharing options...
Lighta Posted January 5, 2012 Group: Members Topic Count: 16 Topics Per Day: 0.00 Content Count: 737 Reputation: 216 Joined: 11/29/11 Last Seen: December 20, 2020 Share Posted January 5, 2012 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. 1 Quote Link to comment Share on other sites More sharing options...
Question
Fluffle Puff
how can I fix it? thanks
Link to comment
Share on other sites
3 answers to this question
Recommended Posts
Join the conversation
You can post now and register later. If you have an account, sign in now to post with your account.