On 2023-11-27 10:24 a.m., Caolán McNamara wrote:
I generally go with option 2. Typically cherry-pick them locally to the branch I want them in, git rebase -i, s to squash the dependants into the parent, add a bit of text about the overall issue, leave the two commit messages and review links so each bit can be read separately at the original gerrit review. FWIW gerrit uses the last Change-Id line it sees as the identifier to link the new review to an old review in the UI.
Thanks for the tips, Caolàn! I had forgotten about adding/editing the Gerrit headers in the commit message to further link the backport change to the original commits.
Patrick
