[Tiki-devel] Questions about cherry-picking

Gary Cunningham-Lee <gary_c-39LOpZwlz1/[email protected]>
Newsgroups gmane.comp.cms.tiki.devel
Message-ID <[email protected]>
Hi,

I tried to do a cherry pick for the first time and it didn't work, so I 
wanted to get info on how to do it. What I did was make a push to master 
and then at Gitlab on that commit's page, in the "Options" dropdown, I 
selected "Cherry pick", and then in the "Pick into branch" selector I 
chose "23.x". Should this method work, or is there a better way?

Ah, should I have committed to branch23 first and then cherry-picked to 
master? (Sorry, seems like SVN deja vu all over again but once I get it 
down, I'll try to stick with it. ;-) ) If I did get the cherry-pick 
direction wrong, should I make the same change in branch23 to get things 
in sync, or is there a better way to do that?

Thanks for any help on this.

-- Gary
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.