Comment 3 for bug 686151

> bzr should refuse to pull if the working tree contains conflicts unless told otherwise

Perhaps; does any other VCS behave like that?

Personally, I think the final state in test2 shouldn't happen to depend on whether or not I happen to do a pull
after the first commit to file 1 in branch test1.