merge vs pull

[Jari Aalto]

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.

- Pull should notify if there are conflicts left (a la CVS)

If pull doesn't signal anything, the user is left under assumption
that everything went ok. Having to supply --verbose during pull in
order to get notification about conflicts is path to confusion.

Option --verbose can print MORE information if supplied.

Jari