git
我就是个渴望成长的小菜鸡
如果你觉得我的文章对你有帮助,欢迎点赞和关注;如有异议,欢迎指出。我就是个渴望在学习中成长为一名合格的程序媛的小菜鸡
展开
-
repo sync error.GitError: manifests rev-list : fatal: revision walk setup failed
更新代码时repo sync 出错:error.GitError: manifests rev-list (‘^HEAD’, u’a78728c68089372c3ce03a76f10143d7a5d83e36’, ‘–’): error: Could not read dc0ec38b6b60d37f093d3ec71945497ebfa20cd5。git pull(可能会报错,这个报错没关系,直接进项下一步)1 到该项目的最外层 进入 repo/manifests。4 退出到最外层,强制更新代码。原创 2023-05-23 18:51:46 · 662 阅读 · 0 评论 -
solve conflicts by beyond compare
1.download beyond compareclick here:2.configure beyond comparedetails as this, click it3.how to use1>if you want to see the file’s difference between master and your local, command as:git difftool filename2>if you want to solve the conflict, e原创 2021-12-03 17:47:55 · 705 阅读 · 0 评论 -
fatal: unable to access ‘https://github.houston.softwaregrp.net/uft/qtp.addins.webbased/‘: error set
fatal: unable to access 'https://github.houston.softwaregrp.net/uft/qtp.addins.webbased/': error setting certificate verify locations:CAfile: “C:ProgramCApath: nonesolution:git config --global http.sslverify "false"execute this command can solve .原创 2021-01-04 16:15:35 · 264 阅读 · 0 评论 -
Git pull出现冲突error: Your local changes to the following files would be overwritten by merge: xxx/...
用git pull来更新代码的时候,遇到了下面的问题:error: Your local changes to the following files would be overwritten by merge: xxx/xxx/xxx.php Please, commit your changes or stash them before you can merge. Aborting出现这...原创 2019-10-26 17:03:47 · 458 阅读 · 0 评论 -
Git pull出现冲突error: Your local changes to the following files would be overwritten by merge: xxx/...
用git pull来更新代码的时候,遇到了下面的问题:error: Your local changes to the following files would be overwritten by merge: xxx/xxx/xxx.php Please, commit your changes or stash them before you can merge. Aborting出现这...原创 2019-10-26 14:02:45 · 163 阅读 · 0 评论 -
git使用
git init demo:创建并初始化仓库。git add 文件名:将新建的文件添加到版本库。git commit -m “提交说明” filename:提交filename文件到本地库。git status <-s>:查看文件状态。git status -s:查看精简的状态输出。git log --stat:查看提交日志且可以看到变更统计。git log退出...原创 2019-08-20 09:00:18 · 88 阅读 · 0 评论 -
git提交代码到远程仓库
1. 进入待提交的代码仓库,如:cd /home/jjj/develop/framework/plugins/vcan-common/2.git add * 提交当前仓库下的所有内容3.git commit -m "文件描述" 提交添加内容到本地库4.git push origin EDA:refs/for/ivali/milestone/eda_stable 将本地库pus...原创 2019-08-20 08:54:01 · 201 阅读 · 0 评论 -
提交代码到gitlab仓库
1.首先进入要上传代码的目录,例如,我要将test文件夹下的代码上传到gitlab,则,(1)cd test通常需要创建README.md文件,(2)echo "# test" >> README.md执行git命令,此命令会在当前目录下创建一个.git文件夹,git init2.git add * 提交当前仓库下的所有内容3.git commit -m ...原创 2019-08-20 08:53:20 · 4725 阅读 · 0 评论 -
git提交代码时出现ssh:could not resolve hostname类似错误
解决方法:看了一下Linux网络连接,发现网络未连接,自己百度解决了网络连接问题,回头再去提交,发现可以成功原创 2019-08-08 09:05:59 · 8247 阅读 · 1 评论 -
初识git
git init demo:创建并初始化仓库。git add 文件名:将新建的文件添加到版本库。git commit -m “提交说明” filename:提交filename文件到本地库。git status <-s>:查看文件状态。git status -s:查看精简的状态输出。git log --stat:查看提交日志且可以看到变更统计。git log退出...原创 2019-07-16 09:30:01 · 113 阅读 · 0 评论