[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-i18n-doc
Subject: Re: [Tellico-users] Merging Tellico frameworks branch into master
From: Albert Astals Cid <aacid () kde ! org>
Date: 2015-07-27 8:27:40
Message-ID: 2691123.KIMfxhOm3K () xps
[Download RAW message or body]
El Diumenge, 26 de juliol de 2015, a les 15:46:44, Robby Stephenson va
escriure:
> On 07/01/2015 08:47 PM, Robby Stephenson wrote:
> > I plan to merge the Tellico frameworks branch into master soon,
> > probably this weekend. The master branch is currently KDE4/Qt4 based,
> > so this is a change to requiring Qt5 and KDE frameworks.
>
> It took me longer than expected, but I just completed the transition.
>
> On 07/02/2015 05:39 PM, Alexander Potashev wrote:
> > 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, merging 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.
>
> I didn't have too many commits in master. I chose to do a merge.
>
> Should I remove the frameworks branch altogether? What's the right way
> to do that, if so?
Yes
git push origin :frameworks
You may not have enough permisions to do that, tell me if you need me to do
it.
Cheers,
Albert
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic