![](https://img-blog.csdnimg.cn/20201014180756916.png?x-oss-process=image/resize,m_fixed,h_64,w_64)
git
javascript艺术
不积跬步无以至千里,不积小流无以成江河!功不唐捐,玉汝于成!
展开
-
git commit规范
git commit规范原创 2022-06-28 11:05:57 · 157 阅读 · 0 评论 -
source tree 输入密码 password required
sourcetree 不停的让输入密码,报 password required1、在终端(terminal)打开你的工程目录2、输入git config credential.helper store3、拉取代码git pull4、输入用户名密码后面就不用再输入了来源:https://www.cnblogs.com/edensyd/p/10858287.html...转载 2021-03-22 11:54:07 · 907 阅读 · 0 评论 -
You have not concluded your merge (MERGE_HEAD exists) git拉取失败
You have not concluded your merge (MERGE_HEAD exists) git拉取失败今天获取git线上仓库代码报了这个错误:zhangzhi@moke:~/code/ktsg-api$ git pullYou have not concluded your merge (MERGE_HEAD exists).Please, commit your chan...转载 2018-07-12 08:46:03 · 326 阅读 · 0 评论 -
Your local changes to the following files would be overwritten by merge
error: Your local changes to the following files would be overwritten by merge: Please commit your changes or stash them before you merge.解决办法1、服务器代码合并本地代码$ git stash //暂存当前正在进行的工作。$ gi...原创 2018-10-30 19:29:50 · 17976 阅读 · 2 评论 -
sourceTree中回退已经推送的代码
sourcetree上重置推送(取消提交的推送),找到项目根目录执行命令,(Mac右侧->终端)执行命令:git reset --soft HEAD^git reset --soft HEAD^进入sourcetree上刷新查看当前已提交代码已经被回退,不在推送中...原创 2019-07-01 09:13:03 · 5766 阅读 · 0 评论