[Kde-games-devel] KGoldrunner: merging v. rebasing

[Ian Wadham]

On 20/10/2012, at 7:08 PM, Yuri Chornoivan wrote:

> Від кого: "Ian Wadham"
> 
>> Some other questions:
>> 
>> - I expected kgoldrunner/CMakeLists.txt to conflict.  There were
>> revisions on both master and branch, but both ended up with
>> the same text (i.e. standalone build and move of doc/).  It seems
>> GIT merge is smart enough to realise this and take just one of them
>> (the older one) into master (?).
> 
> Do not know if this is related, but current git/master does not install kgoldrunner executable itself. Is this expected?

No, not at all.  A line had gone missing from one of the other CMakeLists.txt files,
in the src subdirectory.  I have restored it now.

Thanks, Yuri, and well spotted.

Best regards, Ian W.