[darcs-users] --mark-conflicts

[Maurí­cio]

>> Yes, it can be worked around.  But sometimes this is terribly
>> inconvenient and "I know better than you, Darcs".  (...)

> I'd be curious to learn more about this, i.e. where it would be
> inconvenient to darcs pull and resolve conflicts locally instead
> of pushing to the other end. (...)

My example: I can ssh from machine 1 to machine 2, but not from
machine 2 to machine 1.

Best,
Maurício