![](https://img-blog.csdnimg.cn/20201014180756724.png?x-oss-process=image/resize,m_fixed,h_64,w_64)
git
Jeniclala
这个作者很懒,什么都没留下…
展开
-
Git切换分支报错:error: you need to resolve your current index first 以及needs merge
当想从子分支切换到dev分支时git checkout dev报错:error: you need to resolve your current index firstxxx.java: needs mergexxx.xml: needs merge解决办法:git reset --merge然后再次git checkout dev出现:问题解决!Switched to branch ‘dev’Your branch is up to date with ‘origin/dev’..原创 2021-03-03 09:33:13 · 3002 阅读 · 0 评论 -
git常用命令笔记总结
git 常用命令笔记总结学习原文链接: 资源链接.git status 可以时刻掌握仓库当前的状态git diff 文件名 查看文件变化查看diffrentgit add ——git commit -m “修改说明”git log 命令显示从最近到最远的提交日志git log --pretty=online 简略显示日志git log --pretty=oneline --abbrev-commit 找到历史提交的commit idg原创 2020-08-14 14:13:01 · 119 阅读 · 0 评论