[Kde-games-devel] Konquest

[Roney Gomes]

On Thu Jan 08 2015 at 15:22:13 Inge Wallin <inge at lysator.liu.se> wrote:
>
> Regarding bugfixes, they can be handled in two ways:
> 1. Add them to master and cherry-pick in release branches (the calligra
> way)
> 2. Add them to the release branches and merge them to master (the kde-edu
> way)
> I don't know how they are actually supposed to be handled in kde-games.
>

I also vote for  the merging option. I think that's how we have always done
in KDE Game. The only time I remember cherry-picking was when the release
branch has just been set up and I had pushed to master already.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-games-devel/attachments/20150109/6d8c28bb/attachment.html>