随笔分类 - Git学习
git 只merge一个commit的方法
摘要:https://git-scm.com/book/tr/v2/Git-Basics-Viewing-the-Commit-History gil log 来查看commit的记录 Other maintainers prefer to rebase or cherry-pick contribute
阅读全文
git手动解决内容冲突
摘要:[cpp] view plain copy print? <span style="font-size:18px;">git checkout -b lab4 origin/lab4 git merge lab3</span> [cpp] view plain copy print? [cpp] v
阅读全文