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
|
Try Searching:
servers, voip, java, networking, microsoft ...
|
|
|
| 
