Switched to a new branch '20241030180332.2726909-1-andrew.cooper3@citrix.com'
Applying: Config: Update MiniOS revision
Using index info to reconstruct a base tree...
M	Config.mk
Falling back to patching base and 3-way merge...
Auto-merging Config.mk
CONFLICT (content): Merge conflict in Config.mk
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Config: Update MiniOS revision