[darcs-devel] [issue677] pull conflicts with unrecorded changes

Nicolas Pouillard nicolas.pouillard at gmail.com
Mon Feb 11 20:29:54 UTC 2008


Excerpts from bugs's message of Mon Feb 11 19:30:15 UTC 2008:
> 
> New submission from L. Amber Wilcox-O'Hearn <amber at cs.toronto.edu>:
> 
> Hello.
Hello,

> If I pull and there are unrecorded changes in my current repository and I get
> conflicts, then I don't know how to go back.  I wish there were a darcs command
> to make it go back to how it was before I pulled.  

With  darcs2  you  can give --dont-allow-conflicts to pull, and so avoid to be
in such a case in the first place.

Best regards,

-- 
Nicolas Pouillard aka Ertai
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 278 bytes
Desc: not available
Url : http://lists.osuosl.org/pipermail/darcs-devel/attachments/20080211/eafed542/attachment-0001.pgp 


More information about the darcs-devel mailing list