Git policy: git merge or git cherry-pick

[Cyrille Berger Skott]

On Monday 31 January 2011, jaham at gmx.net wrote:
> But there were problems with the anongit out of sync with git.kde.org.
When this happen, wait a few minutes and try pushing again. There is about one 
minute synchronization delay, between anongit and git.kde.org. So if you are 
unlucky, someone might already have pushed a few seconds before you :)

-- 
Cyrille Berger Skott