git

git

---写给Git初学者的7个建议

拉取远程仓库的更新

jiayao@jiayao:~/projects/vSlam/vSlam$ git add .
jiayao@jiayao:~/projects/vSlam/vSlam$ git commit -m "update local"
[master 8d0662f] update local
jiayao@jiayao:~/projects/vSlam/vSlam$ git merge roborock/dev/master
Already up to date.
jiayao@jiayao:~/projects/vSlam/vSlam$ git log

用clion解决merge产生的冲突