[darcs-users] --mark-conflicts

Eric Kow kowey at darcs.net
Thu Mar 5 08:28:34 UTC 2009


On Wed, Mar 04, 2009 at 19:34:22 -0300, Maurí­cio wrote:
>> 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.

If you can ssh from machine 1 to machine 2, surely you can pull from
machine 2 to machine 1 (just as you can push from machine 1 to machine
2), no?

-- 
Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow>
PGP Key ID: 08AC04F9
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: Digital signature
URL: <http://lists.osuosl.org/pipermail/darcs-users/attachments/20090305/8d74ac40/attachment.pgp>


More information about the darcs-users mailing list