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

List:       kde-games-devel
Subject:    Re: [ksirk] Merge frameworks branch on master ?
From:       Luigi Toscano <luigi.toscano () tiscali ! it>
Date:       2017-08-14 9:56:10
Message-ID: 8845326.ix6dpyndaV () whitebase ! usersys ! redhat ! com
[Download RAW message or body]

On Monday, 14 August 2017 11:34:40 CEST Nemanja Hirsl wrote:
> Дана понедељак, 14. август 2017. у 10.51.05 CEST, kleag@free.fr написа:

> > Should we merge the frameworks branch on master and finish the planned
> > work
> > on Jabber from there ?
> 
> Definetely. I'll push the merge today, just to spend some time testing it.
> As of now, there are 56 commits comming from frameworks. I would merge them
> as is - with all the history, but if you and others prefere, I can squash
> them?

Never ever squash commits: just `git merge origin/frameworks` in master.

You need to fix the kde-build-metadata (needed by build.kde.org) first, and 
sysadmin/repo-metadata too.

Also, keep me in the loop as I need to move the translations.

-- 
Luigi
[prev in list] [next in list] [prev in thread] [next in thread]