merge vs pull

[Aaron Bentley]

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

Jari Aalto wrote:
> Kevin Smith <yarcs at qualitycode.com> writes:
> 
> | John Arbash Meinel wrote:
> | 
> | Ok. So pull should (maybe already does) tell the user if there were
> | conflicts, and describe how the user could find them. Maybe with a
> | --verbose or --show-conflicts option that would list all the files
> | that had conflicted. Those will now have >>>>> conflict markers, right?
> 
> On the contrary. The silence is poison in this case.

There is already output when conflicts occur, and it's not optional.

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

iD8DBQFDjdtc0F+nu1YWqI0RAiItAJ9qiA6VRirW48m6RQK7x9Rd/GwiXgCfccx1
dx058d7Jndjvp6bewcYtkNM=
=6i53
-----END PGP SIGNATURE-----