Switched to a new branch '20241011173049.6503-1-prapal@linux.microsoft.com' Applying: ch: Enable a logfile for ch guests Using index info to reconstruct a base tree... M src/ch/ch_monitor.c Falling back to patching base and 3-way merge... Auto-merging src/ch/ch_monitor.c CONFLICT (content): Merge conflict in src/ch/ch_monitor.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 ch: Enable a logfile for ch guests 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".