Re: What a modern collaboration toolkit looks like

[Tom Tromey]

>>>>> "Stefan" == Stefan Monnier <address@hidden> writes:

>> function.  Also I think we will need a "conflict" state.

Stefan> Be careful with this one: some backends allow commits with conflicts
Stefan> (for later resolution).  And for many operations, it doesn't matter if
Stefan> a file is locally modified or with a conflict, so in many ways
Stefan> "conflict" is a sub-state of "locally modified".

Thanks.

FWIW I didn't have any clue what particular semantics "conflict"
should imply.  I just think that, like pcl-cvs, it is useful to show
this as a separate state in a vc-status buffer.

Tom