［记录］解决git stash pop后Xcode中Info.plist的冲突：The data couldn’t be read because it isn’t in the correct format
crifan 8年前 (2016-04-21) 3466浏览 0评论
licrifandeMacBook-Pro:iOS-Client crifan$ git stash pop Auto-merging JianDao/JianDao/Info.plist CONFLICT (content): Merge conf...