Conflicts are actually pretty easy to resolve, because they come into bzr and I resolve them there like I would with SVN – the workflow seems quite similar. I intend to stick with the bzr-svn combination for the forseeable future, any updates of course will appear here :)