W3C home > Mailing lists > Public > public-ws-policy-eds@w3.org > November 2006

Re: Editorial pass complete, action 84 complete.

From: Felix Sasaki <fsasaki@w3.org>
Date: Thu, 30 Nov 2006 13:55:46 +0900
Message-ID: <456E6452.6050906@w3.org>
To: Frederick Hirsch <frederick.hirsch@nokia.com>
Cc: ext Asir Vedamuthu <asirveda@microsoft.com>, public-ws-policy-eds@w3.org

Frederick Hirsch wrote:
> 
> I am done with my editorial pass and action 84, and am passing this to
> Asir to generate the redline for editorial team review. The guidelines
> xml document is checked in.
> 
> Note I did not check in the corresponding html, since there are
> conflicts and I'm not sure how to say override the remote version with
> the local version, maybe someone can please explain how to do this
> without merging each change individually.

I think that is explained it
http://www.w3.org/2006/07/eclipse/eclipse.html , in sec. "Resolving CVS
conflicts with Text Compare", see "copy all non-conflicting changes from
right to left" or "copy current change from right to left".

Felix

> 
> regards, Frederick
> 
> Frederick Hirsch
> Nokia
> 
> 
> 
> 
Received on Thursday, 30 November 2006 04:56:03 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Tuesday, 8 January 2008 14:20:59 GMT