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

David Roundy droundy at abridgegame.org
Fri Oct 29 11:28:13 UTC 2004


On Thu, Oct 28, 2004 at 04:39:58PM +0000, Mark Stosberg wrote:
> Hello,
> 
> I'd like to ask one of the more experienced people here to update the
> docs for 'push' to explain what happens when there is a conflict. 
> 
> I created this myself with some play archives. darcs will report
> that the push succeeded, but also that there are conflicts. 
> 
> But what state is the remote repo in after this? The local one? What
> needs to happen to resolve the conflict?

I've added a paragraph to the 'push' documentation.  If it's unclear, ask
again...
-- 
David Roundy
http://www.abridgegame.org




More information about the darcs-users mailing list