On Fri Mar 27 14:36:24 2026 +0000, Alfred Agrell wrote:
Convoluted indeed. I don't know what you did to that poor repo. Pipeline https://gitlab.winehq.org/wine/wine/-/pipelines/60289 looks successful to me. I'm not seeing any warnings or unusual rebase-related messages, all I'm seeing is a successful rebase. If you mean "Fast forward merge is not possible. Please rebase." in https://gitlab.winehq.org/wine/wine/-/merge_requests/10365, ignore that. It reappears every day, whenever the main branch updates. Whoever merges it will rebase; if there's an actual merge conflict, the message will change. Alfred,
Okay. I will just bide my time and see if it moves forward. The main thing I was happy about was your suggested refinement got me through a successful pass. Thanks for your assistance. Regards, Craig -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10209#note_134088