Order of merges and the appearance of the revision history

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Joseph Wakeling wrote:

> I'm not talking about automation of the conflict resolution process, I
> just mean that with git, the pull command won't fall over if the two
> branches have diverged---it automatically performs a merge.

In Bazaar, merge --pull has similar behavior.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGL6Rg0F+nu1YWqI0RArPfAJsEddOyR6VBh/tbp35IJel+tqPFsQCfS4Qs
wmUlAt8t0jm5cz+Ilyq0DXQ=
=eujn
-----END PGP SIGNATURE-----