On Saturday 27 October 2012 03:23:34 PM Alexander Neundorf wrote: > Hi, > > I have worked since last year basically only in the kdelibs frameworks > branch... > > So, what is the git workflow for KDE 4.x kdelibs ? > I looked around on techbase.kde.org, also here > https://projects.kde.org/projects/kde/kdelibs , but couldn't find > documentation. > (This one http://techbase.kde.org/Policies still only has a "SVN Commit > Policy" link, and AFAIK this > http://community.kde.org/KDE_Core/Platform_11/Git_Workflow is not being used). > > So, should I simply pull and push to master, and somebody else will merge > into > the 4.10 branch ? > No. Stay away from the kdelibs master branch. Besides only a small set of people can commit into that branch.
For your average bug fix the work flow is: - commit into KDE/4.9 - merge into KDE/4.10 If you have something that should go into 4.10 only, then simply commit into KDE/4.10
