Release branch for KMyMoney 5.0 created

[Thomas Baumgart]

Hi

On Donnerstag, 11. Januar 2018 19:32:16 CET Jack wrote:

> On 2018.01.11 15:45, Thomas Baumgart wrote:
> > On Donnerstag, 11. Januar 2018 13:22:02 CET Brendan Coupe wrote:
> > > I have been compiling from the 4.8 branch since the master was
> > 
> > changed to
> > 
> > > KF5 for development. Before that I compiled from master branch.
> > > 
> > > Can you explain the difference between the master branch and the
> > 
> > 5.0 branch
> > 
> > > moving forward and recommend which one I should use in the future?
> > 
> > The 5.0 branch is the KF5 stable branch for release. Master is for
> > development. Currently, 5.0 is a bit ahead of master by a few fixes.
> > I want to
> > merge them back at some point in time (maybe over the weekend). So
> > for now
> > they are similar. If you want to follow the development of new
> > features stay
> > on master. In case you want a stable version stay on 5.0.
> 
> Am I correct that we could wait until the 5.0 release, and then do a
> more bulk merge of the 5.0 changes back into master?  I have no
> problems with doing them individually (cherry picking?)  but would
> think whatever is overall easiest is probably the good approach.

I am planning to merge the stuff back, maybe multiple times. So we don't need 
the individual cherry-picking stuff.


-- 

Regards

Thomas Baumgart

https://www.telegram.org/       Telegram, the better WhatsApp
-------------------------------------------------------------
() ascii ribbon campaign - against html e-mail
/\ www.asciiribbon.org - against proprietary attachments
-------------------------------------------------------------
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 846 bytes
Desc: This is a digitally signed message part.
URL: <http://mail.kde.org/pipermail/kmymoney-devel/attachments/20180113/20ac9b58/attachment.sig>