[Kde-pim] how to merge to master?

[Christophe Giboudeaux]

Hi,

On Sunday 03 March 2013 23:44:21 Wolfgang Rohdewald wrote:
> Hi Christophe,
> 
> I see you just merged my KDE/4.10 commit to master
> 
> but I thought I already did.
> 
> What I did:
> 
> commit to KDE/4.10
> git checkout master
> git merge KDE/4.10
> git push
> git checkout KDE/4.10
> git push
> 

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.

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')

With 'nothing' you have to specify what you really want to push and where 
(typically 'git push origin master') while with 'upstream', a simple 'git 
push' with *only* push the current branch to its upstream branch.

Christophe



> and I had both branches master and KDE/4.10 point to my commit f529d75a1b
> 
> just like the commit  a018fe1f8269 from Frank Osterfeld
> before (which also was the head of both master and KDE/4.10)
> 
> so I thought everything is fine.
> 
> Now I see in commit 236f625 that you cherry-picked my commit from 4.10 into
> master. I was told cherry picking is not wanted in kdepim.
> 
> And http://quickgit.kde.org/?p=kdepim-runtime.git shows my commit twice in
> master history:
> 
> http://quickgit.kde.org/?p=kdepim-runtime.git&a=shortlog&h=a849d2d93e893cd97
> 0694f06c91eba397e5e7d11
> 
> now I am very confused. What did I do wrong? Especially compared with the
> commit from Frank Osterfeld?

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: This is a digitally signed message part.
URL: <http://mail.kde.org/pipermail/kde-pim/attachments/20130303/48fc5f2c/attachment.sig>
-------------- next part --------------
_______________________________________________
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/