Re: www-user(css) version 2.0

[Allan Rae]

On Tue, 19 Jun 2001, Michael Koziarski wrote:

> > Remember to 'cvs update -dP' first as I've made a couple of small fixes to
> > get the ccp2000 logo visible on all pages.
>
> I'm running a Dimensional Data Warehousing training course this week
> and will be a bit short on time.  However I should be able to prepare
> something by Friday 5pm (NZST).  I've been having some problems with
> merging the differences (CVS puts all those stupid <<<<<<< characters
> in and confuses me :)) but it's nothing a little tinkering won't fix.

So long as you can find the matching ========== and >>>>>>>>>>>>> it
shouldn't be too confusing.  Of course cvs can decide occasionally that
massive chunks are different when it'd be more sensible to get several
smaller chunks.  I'm not sure why it does that.

Allan. (ARRae)