标签：needs merge unable to refresh index

crifan 8年前 (2016-04-08) 16564浏览 0评论

之前git stash pop后，出现文件冲突CONFLICT： licrifandeMacBook-Pro:iOS-Client crifan$ git stash pop Auto-merging JianDao/MyViewControl...