Re: [SOLVED] Re: 2 commits pushed on gerrit but not retrievable and not present in cgit.

[Christian Lohmaier <lohmaier@xxxxxxxxxxxxxx>]

On Tue, Dec 22, 2020 at 4:42 PM julien2412 <serval2412@xxxxxxxx> wrote:
>
> sberg wrote
> > both of them are "Marking change merged without cherry-picking to
> > branch, as the resulting commit would be empty."  i.e., apparently some
> > other commit(s) meanwhile made the exact same changes?
>
> Thank you for the feedback Stephan!
> Indeed for https://gerrit.libreoffice.org/c/core/+/108120, it's empty.
> For the other, it's not empty but saw also this message, weird...

that's because we use the "cherry-pick on top of branch" strategy. It
would be empty if it were rebased on top of current master.
That is what happened for the other patchset - for that you triggered
a rebase and it already was empty at that point...

ciao
Christian
_______________________________________________
LibreOffice mailing list
LibreOffice@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/libreoffice