W3C home > Mailing lists > Public > public-grddl-wg@w3.org > February 2007

Re: Sets of related test cases (hg admin)

From: Chimezie Ogbuji <ogbujic@bio.ri.ccf.org>
Date: Wed, 21 Feb 2007 01:20:13 -0500 (EST)
To: Dan Connolly <connolly@w3.org>
cc: "Clark, John" <CLARKJ2@ccf.org>, public-grddl-wg <public-grddl-wg@w3.org>
Message-ID: <Pine.GSO.4.60.0702210118440.22712@joplin.bio.ri.ccf.org>

On Tue, 20 Feb 2007, Dan Connolly wrote:
> And when I try to 'hg merge', I get conflicts. Maybe we can just
> discard/ignore the 8a5bc100babf head/branch. I dunno. oh well.

That probably would be the quickest way to resolve the conflicts.  That 
particular changeset (the last one on that 'branch') can be reapplied 
manually from the diffs - I can do that once you discard it.

Chimezie Ogbuji
Lead Systems Analyst
Thoracic and Cardiovascular Surgery
Cleveland Clinic Foundation
9500 Euclid Avenue/ W26
Cleveland, Ohio 44195
Office: (216)444-8593
Received on Wednesday, 21 February 2007 06:20:27 UTC

This archive was generated by hypermail 2.3.1 : Tuesday, 6 January 2015 20:39:10 UTC