how do I get rid of "pending merges:"?
aaron.bentley at utoronto.ca
Tue Jul 10 22:04:49 BST 2007
-----BEGIN PGP SIGNED MESSAGE-----
Sam Steingold wrote:
> am I at the latest and greatest revision?
Yes. The pull output tells you that you are up to date with
> if yes, why do I have "pending merges"?
It appears you did a merge when you should have done a pull. Pull is a
mirroring operation. It updates your local copy to the latest upstream
version. That appears to be what you wanted.
Merge is used for keeping up-to-date when you are making changes (and
committing them). After you merge, you should commit.
And to answer the subject line, "bzr revert" will clear pending merges.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
-----END PGP SIGNATURE-----
More information about the bazaar