创建新的文件夹
忽略文件
忽略该死的UserInterfaceState.xcuserstate
忽略UserInterfaceState.xcuserstate
试试
Merge branch 'dev'
UserInterfaceState.xcuserstate
haha