Merge or Cherry-Pick?

[John Layt]

On Tuesday 08 February 2011 17:49:12 Nicolás Alvarez wrote:
> >> Or should I give up and cherry-pick ? (I'd really like not to).
> > 
> > My recommendation: Keep the fix in 4.6 only for the moment. Just wait
> > until the initial merge has happened - and lets hope (HOPE BIG TIME) that
> > the person doing that merge knows what s/he is doing!
> 
> I have now merged 4.6 into master in kde-workspace.

Great, so now I can try merge my outstanding forward-ports instead of cherry-
picking?  Just so I don't mess it up, what's the correct procedure to do so?  
And after the merge, is there anything else I need to do (Ben's warning about 
pull after merge is ringing in my ears here).

Cheers!

John.