Switched to a new branch '20241029205819.69888-1-phil@philjordan.eu'
Applying: ui & main loop: Redesign of system-specific main thread event handling
Using index info to reconstruct a base tree...
M	include/qemu-main.h
M	include/qemu/typedefs.h
M	system/main.c
M	ui/cocoa.m
M	ui/sdl2.c
Falling back to patching base and 3-way merge...
Auto-merging ui/sdl2.c
Auto-merging ui/cocoa.m
Auto-merging system/main.c
CONFLICT (content): Merge conflict in system/main.c
Auto-merging include/qemu/typedefs.h
CONFLICT (content): Merge conflict in include/qemu/typedefs.h
Auto-merging include/qemu-main.h
CONFLICT (content): Merge conflict in include/qemu-main.h
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ui & main loop: Redesign of system-specific main thread event handling
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".