简体中文(ZH-CN) English(EN) 繁体中文(ZH-TW) 日本語(JA) 한국어(KO) Melayu(MS) Français(FR) Deutsch(DE)
ios - git merge以后貌似文件有冲突了，不知道怎么修改
ringa_lee
ringa_lee 2017-04-17 17:43:57
0
1
268

鄙人去年接触iOS 开发以及git管理，刚才在一个非master分支上git merge master以后变成这样了，git的命令我有些忘记了，不知该怎么解决？
用命令行搜索冲突文件的话怎么操作？怎么修改？求大神指点

ringa_lee
ringa_lee

ringa_lee

reply all (1)
Peter_Zhu
Peter_Zhu2017-04-17 17:45:57 1 floor

git didn’t prompt a conflict, did you merge directly? If it doesn’t work, just pod clean and install again

Like+0
Add Reply
    Popular Topics
    More>
    Popular Articles
    Popular Tutorials
    More>
    Related Tutorials
    Popular Recommendations
    Latest courses
    Latest Downloads
    More>
    Web Effects
    Website Source Code
    Website Materials
    Front End Template
    About us Disclaimer Sitemap
    php.cn：Public welfare online PHP training，Help PHP learners grow quickly！