Conflict inside derivable.slate
water at tunes.org
Fri Mar 18 07:35:15 PST 2005
On Mar 17, 2005, at 8:06 PM, Paul Dufresne wrote:
> Hum, ok, your repositories are ok.
> So I decided to search on my side.
> First, I did darcs revert to remove the unrecorded stuff on
> derivable.slate I
> Then I discovered that by using --verbose in darcs pull, we get info
> on patch we
> have that the other don't have:
> paul at arctanov:~/myslate/main $ darcs pull --verbose Pulling from
> We have the following new (to them) patches:
> Tue Mar 15 19:34:07 EST 2005 Brian T. Rice <water at tunes.org>
> * Modifications to addPrototype:derivedFrom: for redefinitions.
> They have the following patches to pull:
> No remote changes to pull in!
> paul at arctanov:~/myslate/main $
> So I check what this patch is:
> Is this a patch I should "remove" or is it a patch you lost and like
> to have back?
The patch is one that is needed for the recent fixes. If your local
derivable.slate matches the pre-state of this patch, pull it. If it
appears that your local derivable.slate already has it applied, just
avoid it and try to figure out why.
Brian T. Rice
LOGOS Research and Development
More information about the Slate