svn update not working right

[robe]

I seem to be having issues again -- strk did you change raster now.

winnie is failing again and I'm having similar issue on my computer.

Getting this error:

Updating '.':
Skipped 'raster\rt_pg\rtpostgis.sql.in' -- Node remains in conflict
At revision 11214.
Summary of conflicts:
  Skipped paths: 1

So I have to use tortoise svn to update instead of my regular commandline one. (which I forget what that is maybe silksvn)

Are other people having issues with strks changes in svn or is it just me?

Note this is similar issue to:

#2239

[robe]

blowing out my folder and restarting from scratch fixed this. Not sure why I had it in first place.