On Friday 26 August 2011 12:04:29 Stephen Kelly wrote: > Hi, > > I merged the 4.7 branch into frameworks recently. Now it's easy to merge > again, so no need to cherry-pick when you fix things in 4.7. You can merge > instead.
OK, how do I do that exactly? Commit in 4.7, fetch in frameworks, then what? git merge KDE/4.7? -- David Faure, fa...@kde.org, http://www.davidfaure.fr Sponsored by Nokia to work on KDE, incl. Konqueror (http://www.konqueror.org).
