On Monday 17 December 2012 14:47:11 David Faure wrote: > Now that all modules have a KDE/4.10 branch, kdelibs can use again the same > workflow as the other modules: 4.10 for the 4.10.x series, and master for > the 4.11.x series. This will create less confusion than a frozen master and > a different branching date. > > However, kdelibs master is STILL feature frozen. > The non-feature-frozen branch of kdelibs is "frameworks". > > Don't commit new features to kdelibs master, and please don't commit > unnecessary changes either (any "cleanup" is very likely to cause a conflict > in the frameworks branch). > Feel free to commit "cleanups" and new features in frameworks, however.
And... the kdelibs git workflow is still based on git merge: 4.10 -> master -> frameworks i.e. if you commit a bugfix in 4.10, do a "git merge origin/KDE/4.10" in master and a "git merge origin/master" in frameworks, or ask me to do it. -- David Faure, [email protected], http://www.davidfaure.fr Working on KDE, in particular KDE Frameworks 5
