[darcs-users] Re: request for clear docs for 'push' and conflicts

[Mark Stosberg]

On 2004-10-28, Juliusz Chroboczek <jch at pps.jussieu.fr> wrote:
>> I really think the CVS behavior makes more sense here: With CVS
>> I must resolve conflicts with the remote repo before committing. 
>
> But Darcs is decentralised (you can do a merge between remote
> repositories) and asynchronous (you can perform a merge by e-mail).

OK. I hadn't fully grasped that. That could be worth mentioning somehow
in the 'push' documentation as well. So what /is/ push doing when there
are conflicts? :)

	Mark