[geeklog-devel] [geeklog-cvs] geeklog: Update FCKeditor to ver 2.6.4

[Dirk Haun]

Blaine Lang wrote:

>My local repository was taken from Sunday - what was changed in the 
>FCKeditor directory that needed merging?

It's just the way a DVCS works:

<http://www.selenic.com/mercurial/wiki/index.cgi/
UnderstandingMercurial#head-f23c884719f1053c893dac0c6de4b01157deebbd>

We were doing changes on our local repositories in parallel.


>I had a warning and needed to use the force option

Don't use the force, Luke.

bye, Dirk


-- 
http://www.haun-online.de/accu/