[darcs-users] Conflicts

[Erik Bågfors]

darcs pull
resolve conflicts,
darcs push

/Erik

On Wed, 2 Feb 2005 13:07:50 +0100, tnorth at bluewin.ch <tnorth at bluewin.ch> wrote:
> Hello,
> Now that we are using darcs for a web project, I would need more doc about
> resolving conflicts.
> For exemple, darcs push fails because a file was changed on the server, because
> of  a cache file created or a mysql table change.
> I just want to ignore it and to have the push overwrite concerned files.
> is is easily possible ?
> 
> Thanks,
> T.North
> 
> _______________________________________________
> darcs-users mailing list
> darcs-users at darcs.net
> http://www.abridgegame.org/mailman/listinfo/darcs-users
>