Upstream 2.14.2 conflicts
The iPhone Duo on an Apple Silicon Mac: a virtual foldable iPhone runn
Status: Beta
Brought to you by:
a-hackers-guide
Menu
▾
▴
#2 Upstream 2.14.2 conflicts
open
nobody
None
4 days ago
4 days ago
Anonymous
No
Originally created by: github-actions[bot]
Merging vphone-cli 2.14.2 into duo/appearance-and-setups conflicts in:
Research/Guest/iphone_duo_bringup.mdVPhoneDaemon/Configuration/VPhoneDaemon.entitlementsVPhoneDaemon/Native/vphoned_pose.mVPhoneExecutable/VPhoneVirtualization/Build/ValidateBundle.shVPhoneExecutable/VPhoneVirtualization/UI/UserInterface/VPhoneVirtualMachineWindowController.swiftVPhoneExecutable/VPhoneVirtualization/UI/VPhoneBootCommand+VirtualMachine.swiftVPhoneExecutable/VPhoneVirtualization/UI/VPhoneVirtualMachineAppDelegate.swiftVPhoneExecutable/VPhoneVirtualization/UI/VirtualMachine/VPhoneVirtualMachine.swiftVPhoneGuestComponents/Hinge/VPhoneHingeState.hVPhoneGuestComponents/Hinge/libvphonehinge.mVPhoneGuestComponents/MakefileVPhoneKit/VPhoneCoreKit/VirtualMachine/VPhoneGuestDevice.swift
Resolve the merge on that branch, then close this issue: the next run builds and releases duo-2.14.2.
