- From: Ivan Herman <ivan@w3.org>
- Date: Wed, 25 May 2011 15:30:45 +0200
- To: Dan Brickley <danbri@danbri.org>
- Cc: "Eric Prud'hommeaux" <eric@w3.org>, Richard Cyganiak <richard@cyganiak.de>, RDF Working Group WG <public-rdf-wg@w3.org>
... and I have added a reference to this page and some other tools on the home wiki page under 'W3C Working Group Resources' I. On May 25, 2011, at 15:14 , Dan Brickley wrote: > On 25 May 2011 15:59, Eric Prud'hommeaux <eric@w3.org> wrote: >> * Eric Prud'hommeaux <eric@w3.org> [2011-05-25 08:43-0400] > >> In case someone later recalls this thread to see how to assure mercurial that conflicts are resolved, the somewhat opaque command is "hg resolve --mark". (This should really show up in the "can't commit with unresolved conflicts" error message. Mercurial's feature of remembering conflicts is probably useful, but has inspired some serious tearing out of hair in the past. >> > > I've added this to http://www.w3.org/2006/tools/wiki/Mercurial ... and > encourage others who figure out any annoying details / tricks to > record things in that wiki too. You can log in with your standard W3C > account, no need for extra registrations, so it only takes a few > seconds to paste in some text or a useful link. > > cheers, > > Dan ---- Ivan Herman, W3C Semantic Web Activity Lead Home: http://www.w3.org/People/Ivan/ mobile: +31-641044153 PGP Key: http://www.ivan-herman.net/pgpkey.html FOAF: http://www.ivan-herman.net/foaf.rdf
Received on Wednesday, 25 May 2011 13:28:38 UTC