Re: [Wireshark-dev] Why does Gerritt sometimes allow a merge but other times want a cherry-pick?

[Alexis La Goutte]

Hi Richard,

it is because it is not possible to merge without (manual) modification.
You need to make a manual cherry-pick
go on master-2.4 branch
git checkout master-2.4
and cherry-pick change
git cherry-pick -x commitid

Cheers

On Fri, Feb 23, 2018 at 11:18 PM, Richard Sharpe <
realrichardsha...@gmail.com> wrote:

> Hi folks,
>
> I notice that Gerritt wants to use a cherry-pick strategy for my
> latest changes for bug 14455 here
> https://code.wireshark.org/review/#/c/26046
>
> I am not sure how to proceed at this point? Do I cherry-pick the
> change to master?
>
> --
> Regards,
> Richard Sharpe
> (何以解憂？唯有杜康。--曹操)
> 
> ___
> Sent via:Wireshark-dev mailing list 
> Archives:https://www.wireshark.org/lists/wireshark-dev
> Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev
>  mailto:wireshark-dev-requ...@wireshark.org?subject=
> unsubscribe
___
Sent via:Wireshark-dev mailing list 
Archives:https://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev
 mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe

[Wireshark-dev] Why does Gerritt sometimes allow a merge but other times want a cherry-pick?

[Richard Sharpe]

Hi folks,

I notice that Gerritt wants to use a cherry-pick strategy for my
latest changes for bug 14455 here
https://code.wireshark.org/review/#/c/26046

I am not sure how to proceed at this point? Do I cherry-pick the
change to master?

-- 
Regards,
Richard Sharpe
(何以解憂？唯有杜康。--曹操)
___
Sent via:Wireshark-dev mailing list 
Archives:https://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev
 mailto:wireshark-dev-requ...@wireshark.org?subject=unsubscribe