Needed for buildbot, but interactively solving svn conflicts in the middle of manual make update is also not ideal.