Comment 5 for bug 653031

I don't have an exact reporoduce receipe, and it was month ago, so I don't remember all details. But I think the steps should be:

* you have 1st branch with uncommitted changes (I'm not sure for 100% though) and 2nd branch with committed diverged changes;
* push from 2nd branch to 1st, got conflict
* go to 1st branch and run `bzr resolve --take-other`, got traceback