Re: [Tiki-devel] Questions about cherry-picking

Hi Gary

Thanks, good question - i think we're aiming for always commit to master/trunk first and then cherrypick/backport to the branches you need it in, but this is all new so i guess we're making it up as we go. As we switch sites to 23.x and uncover bugs it's often easiest to fix and test them in 23.x and then cherrypick to master, as if the fix needs fine tuning the work soon amplifies if you have to test and work on more than one branch...

How do other projects do this?

At least with git now we can feasibly compare one branch to another and check everything's that in stable is also in master, i wonder if that could be automated somehow? (in the CI)

jonny

p.s. to answer the question, i do this in phpstorm and there's a little cherry icon on the git log panel which does it for me 🍒 :p


> On 18 Jul 2021, at 10:49, Gary Cunningham-Lee <[email protected]> wrote:
> 
> 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
> 
> 
> 
> _______________________________________________
> TikiWiki-devel mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
> 



_______________________________________________
TikiWiki-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel