On Wed Jul 24 16:08:05 2024 +0000, Elizabeth Figura wrote:
> Gitlab seems to claim that when it's actually not true, unfortunately. I
> don't know if there's anything we can do about it.
> I don't think merge requests need to be rebased unless there are
> actually merge conflicts.
I see, thanks for letting me know about that!
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/6133#note_76955
On Wed Jul 24 10:05:49 2024 +0000, Đorđe Mančić wrote:
> My bad, sorry. I'm new to contributing to Wine and the GitLab site said
> that the merge request can't be approved if I don't rebase, so that's
> why I did it.
Gitlab seems to claim that when it's actually not true, unfortunately. I don't know if there's anything we can do about it.
I don't think merge requests need to be rebased unless there are actually merge conflicts.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/6133#note_76952
On Wed Jul 24 10:05:49 2024 +0000, Fabian Maurer wrote:
> FWIW, I don't think you need to rebase it, unless there is conflicts.
My bad, sorry. I'm new to contributing to Wine and the GitLab site said that the merge request can't be approved if I don't rebase, so that's why I did it.
--
https://gitlab.winehq.org/wine/wine/-/merge_requests/6133#note_76935