git cherry-pick git diff repo sync
git cherry-pick conflict:
just do like this:
1.git status
2.find the files which is both modified.
3.edit and solve the conflict one file by one file.
4.git add the files you have just modifi...
原创
2018-08-28 19:46:56 ·
605 阅读 ·
0 评论