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

[Yuri Chornoivan]

Від кого: "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 (?).

Hi,

Do not know if this is related, but current git/master does not install kgoldrunner executable itself. Is this expected?

Thanks in advance for your answer.

Best regards,
Yuri