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

List:       kde-i18n-doc
Subject:    Re: Merging Tellico frameworks branch into master
From:       Alexander Potashev <aspotashev () gmail ! com>
Date:       2015-07-02 21:39:44
Message-ID: CADMG6+_FH=GG6EVwgBrdGaLGWx2QaM0kn+zkQjpCOaQ1s7Jv1Q () mail ! gmail ! com
[Download RAW message or body]

2015-07-02 23:48 GMT+03:00 Albert Astals Cid <aacid@kde.org>:
> El Dijous, 2 de juliol de 2015, a les 09:54:56, Alexander Potashev va
> escriure:
>> If you are not going to develop for Qt4/KDELibs4 in the master branch
>> anymore, it may be easier to _rename_ the frameworks branch into
>> master.
>
> I disagree, mergning frameworks to master is safer, that way you're sure you
> don't miss anything that may have been in master but not in frameworks.

It depends on the number of commits in these branches after they diverge.

-- 
Alexander Potashev
[prev in list] [next in list] [prev in thread] [next in thread]