How to resolve tree svn confict

[bash]svn resolve –accept working -R <path>
[/bash]

To revert a backward state in svn repository:

[bash]svn log[/bash]

chose the number of interested revision, then

[bash]svn update -r 000000[/bash]

http://stackoverflow.com/questions/12559929/resolving-tree-conflict