Hi Michael,
Michael Stahl schrieb am 19.09.2025 um 18:18:
On 19/09/2025 18:09, Regina Henschel wrote:
Hi all,
I have patch https://gerrit.libreoffice.org/c/core/+/191159 in Gerrit.
Xisco changed it from patch set 3 to patch set4.
How do I get this change to my local repository, which is still in
state of patch set 3?
hi Regina,
first you need to get rid of your own patch nr. 3, for example via "git
rebase -i" and deleting the corresponding line.
(now if you have *only* this commit on top of upstream branch, the input
for "git rebase -i" will end up empty and it will do nothing, use "git
rebase -i HEAD~2" to work around that, this is annoying...)
I made something wrong, so that I have got two patch files instead of
one. But I had got a clone without any own changes and using that it
finally works.
once that is removed, go to gerrit's web ui for the patch set nr. you
want, use the vertical-"..." button in top-right corner, click "Download
patch" and paste the "Cherry pick" command into a shell.
Using cherry pick worked then and I could add my additional changes.
Thank you.
Kind regards,
Regina
