ERROR: These branches have diverged.
aaron.bentley at utoronto.ca
Mon Mar 26 17:19:59 BST 2007
-----BEGIN PGP SIGNED MESSAGE-----
Sam Steingold wrote:
> 1. if I have local uncommitted changes, I think pull (or something
> else?) will fail.
Pull will not fail. It was intended to work that way. Merge would
fail, but you won't need it.
> 2. ok, now that I screwed up things by local commits, how do I recover?
If you have a checkout, "bzr pull --overwrite", and then reapply your
patch. Otherwise, "bzr uncommit".
 "merge --force" will merge even with uncommitted changes, but it's
highly unusual to do that.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
-----END PGP SIGNATURE-----
More information about the bazaar