[Kde-pim] how to merge to master?

[Wolfgang Rohdewald]

Am Sonntag, 3. März 2013, 23:59:36 schrieb Christophe Giboudeaux:
> Well, that's not what happened: you were on the master branch, committed your 
> change but pushed it to the KDE/4.10 branch.
> 
> That's why you couldn't merge KDE/4.10 into master.
> 
> The repo was locked by the sysadmin team in order to avoid more broken commits 
> and once done I cherry-picked the commit in KDE/4.10 then merged the branch 
> into master.

Thank you for sorting this out so quickly!
 
> That's why the commit appears twice in master now.
> 
> I suggest setting a push.default value to 'nothing' or 'upstream' in your git 
> config ( 'git config --global push.default nothing' or 'git config --global 
> push.default upstream')

done.

-- 
Wolfgang
_______________________________________________
KDE PIM mailing list kde-pim at kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
KDE PIM home page at http://pim.kde.org/