1

I've accidentally pulled to my local bazaar repo from a wrong location. Fortunately my files have not been overwritten, as bazaar recognized the difference:

bzr: ERROR: These branches have diverged. Use the missing command to see how.  
Use the merge command to reconcile them.`

However the object packs have been pulled, and I suspect they may cause conflicts if I don't clean them up now.

I saw that with git you can do this via git reset --hard HEAD^.

Bazaar doc says there's only partial support for that. What is the proper way of resolving this mistake with bazaar? Is bzr revert enough?

4

1 回答 1

2

如果您收到一条消息：

bzr: ERROR: These branches have diverged. Use the missing command to see how.  
Use the merge command to reconcile them.

然后，您无需执行任何操作。集市不要拉任何会导致你问题的东西。

于 2012-10-28T01:39:57.573 回答