After doing an svn update, if you run svn status and get a " > local unversioned, incoming add upon update" error, perform the following:
svn resolve --accept working <conflicting_dir>
svn revert <conflicting_dir>
svn status
Thanks, http://tomhennigan.blogspot.com/2012/01/resolve-tree-conflict-svn-local.html#!/2012/01/resolve-tree-conflict-svn-local.html
6 comments:
thanks you saved my time
Perfect. Worked well - thanks for the help.
Glad it worked!
Helped. Thanks.
Could you explain what had happened and how did these commands help?
Sorry, I don't quite remember what I did to get to this state. Apparently it is a common problem with a lot of people. If it happens again, I'll post what I did to get there.
after doing the same, I got all directories and files with status as D and I am worry to loose all.
Post a Comment