Git
Gr_lbxx
这个作者很懒,什么都没留下…
展开
-
git合并分支时如何解决冲突
合并时有冲突 $ git merge --no-ff modifyGR error: Merging is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm <file>' hint: as appropriate t...原创 2018-11-15 15:10:42 · 2538 阅读 · 0 评论 -
git撤销某一次的提交
输入git log查看提交的日志 ,找到需要撤销的并复制下来 $ git log commit 6fe9a852655388a99ff0c2740b4e4b56118d87f8 Author: Date: Tue Nov 20 16:42:05 2018 +0800 解决应用名称有中文时生成秘钥报错的问题 commit e8219d5603e13326e520466ba1351...原创 2018-11-21 11:04:54 · 1590 阅读 · 0 评论