In this fourth installment of the series we will see how to resolve a conflict using the "postpone" option.
We have two local copies of a repository, make conflicting modifications to them, and then use svn command line tools to resolve the differences and get our repo back in a stable state.
...
https://www.youtube.com/watch?v=hubWjFgnjvI