14 Dec
2022
14 Dec
'22
9:47 a.m.
On Wed Dec 14 09:47:33 2022 +0000, Gerald Pfeifer wrote:
Sooo... squashing - 2cdbe34a - winebus.sys: Fix the build without HAVE_SYS_INOTIFY_H - 302ef78f - winebus.sys: Fix the build without HAVE_SYS_INOTIFY_H (and ignoring the 21 commits from branch wine:master) this now works and does what everyone suggested. Just Git and me are not friends yet, and I'm not sure how to proceed. :-( I could create a completely new request, which would lose history and doesn't feel right? Help, please. With your branch checked out, you can do `git rebase -i master`. Then change the second "pick" into "fixup" and force push the branch again.
-- https://gitlab.winehq.org/wine/wine/-/merge_requests/1810#note_19628