[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-core-devel
Subject:    Re: KDE3.1 Feature: kcmfonts / kcmfontinst
From:       Craig Drummond <cpdrummond () freeuk ! com>
Date:       2002-06-12 9:28:35
[Download RAW message or body]

> So you don't want it on the webpage, you just want it in the release?


How do I put it in the web-page?

> 
> > Is there no way for me to just simply merge the changes from the "
make_
> > it_cool" branch into the main branch?
> 
> Not  commenting on the 'can I commit' issue; please be aware that you

> need to merge the branch, not just overwrite the HEAD from your local

> HD.
>     cvs up -A
>     cvs up -j make_it_cool
> fix merge errors
> make all install
>     cvs commit
> 
> Hope I'm not pointing you to obvious things here, but better to say 
too much
> to make you aware of potention pittfalls :)

Fine - no problem. I'm pretty new to CVS - Waldo created the branch, 
and I just thought it was about time it got merged into the main branch.
But, as the code has been extensively changed, there will be *lots* of 
merge errors. I'll look into this tonight...

Thanks.

Craig.
[prev in list] [next in list] [prev in thread] [next in thread]