[记录]解决git stash pop后Xcode中Info.plist的冲突:The data couldn’t be read because it isn’t in the correct format
crifan 10年前 (2016-04-21) 4711浏览
licrifandeMacBook-Pro:iOS-Client crifan$ git stash pop Auto-merging JianDao/JianDao/Info.plist CONFLICT (content): Merge conf...
![[记录]解决git stash pop后Xcode中Info.plist的冲突:The data couldn’t be read because it isn’t in the correct format](https://www.crifan.com/files/pic/uploads/2017/11/034cf23b6738e4b5546764a9a085f673-220x150.png)
