Re: How do I create a merge request for changes to get into the next 3.6.x release

[Guy Harris <gharris () sonic net>]

On Dec 15, 2021, at 10:30 PM, Guy Harris <gharris () sonic net> wrote:

> If the cherry-pick cannot be done automatically, you'll have to do it by hand, in a tree checked out with the 
> release-3.6 branch.  Do the cherry pick - if you're doing it from the command line, do it with "git cherry-pick -x" 
> to include the "Cherry-picked from" text - and fix whatever needs to be fixed before committing.

In this case, I usually replace "Cherry-picked from ..." with "Backported from ..." to indicate that some additional 
work was needed.

___________________________________________________________________________
Sent via:    Wireshark-dev mailing list <wireshark-dev () wireshark org>
Archives:    https://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev
             mailto:wireshark-dev-request () wireshark org?subject=unsubscribe