[Gammaray-interest] Git workflow

[Volker Krause]

On Monday 28 January 2013 09:17:04 Kevin Funk wrote:
> Now that we've released 1.3, I'd like to revise our Git workflow.
> 
> As far as I understood, we semi-agreed on the following workflow a few weeks
> ago:
> - Apply fixes in the stable branch (e.g. now that would be '1.3')
> - Merge the stable branch back into master regularly
> - Feature development goes to master as before
> 
> Agreed?

agreed.

Some notes on the next steps in master: I think we should first merge Kevin's 
probesplit branch, and then the remote-model branch (any further work there 
depends on Kevin's branch).

This however means we are turning master into the future 2.0, which will be 
disruptive and might take a while (I want to be able to show this at QtDD13, 
so at least not indefinitely ;) ). Therefore we might want to put smaller new 
features into the 1.3 branch as well, and have slightly larger 1.3.x releases 
until 2.0 is ready.

regards,
Volker

-- 
Volker Krause | volker.krause at kdab.com | Senior Software Engineer
KDAB (Deutschland) GmbH&Co KG, a KDAB Group company
Tel. Germany +49-30-521325470, Sweden (HQ) +46-563-540090
KDAB - Qt Experts - Platform-independent software solutions
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 3634 bytes
Desc: not available
URL: <http://mail.kdab.com/pipermail/gammaray-interest/attachments/20130128/f8b99608/attachment-0001.bin>