git常用的几个命令

最新推荐文章于 2024-08-29 11:34:48 发布

置顶 Tech沉思录

最新推荐文章于 2024-08-29 11:34:48 发布

阅读量4.4k

点赞数 1

分类专栏： Windouws10相关文章标签： git github

本文链接：https://blog.csdn.net/suyunzzz/article/details/105509559

版权

Windouws10相关专栏收录该内容

10 篇文章 0 订阅

订阅专栏

git

为什么要使用git？

代码管理，写完代码之后需要把它备份到一个仓库
版本控制
团队协作

常用的指令

git clone （推荐）

从远程仓库复制项目同时也初始化

git init + git remote add origin+仓库地址

初始化&配置仓库地址

git add + 修改的文件

如果是全部的文件就是git add .

git commit -m “更新日志”

将代码放在clone后的文件夹下，在bash中输入这条命令就能实现文件上传到版本库

git push

版本库上传到远程仓库。
修改文件后上传

git pull

每次开发前都要pull一下，保证本地与远程仓库一样。

常见错误

1

error: failed to push some refs to 'git@github.com:....." Updates were rejected because the remote contains work that you do not have locally.

This is usually caused by another repository pushing to

解决
参考这篇博客以及下面的评论
在这里插入图片描述
具体解决就是先pull合并，然后再push

$ git pull --rebase origin master
From https://github.com/suyunzzz/aiimooc_lesson
 * branch            master     -> FETCH_HEAD
Successfully rebased and updated refs/heads/master.

$ git push -u origin master
Enumerating objects: 27, done.
Counting objects: 100% (27/27), done.
Delta compression using up to 12 threads
Compressing objects: 100% (22/22), done.
Writing objects: 100% (25/25), 41.31 MiB | 2.08 MiB/s, done.
Total 25 (delta 5), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (5/5), completed with 2 local objects.
remote: warning: GH001: Large files detected. You may want to try Git Large File Storage - https://git-lfs.github.com.
remote: warning: See http://git.io/iEPt8g for more information.
remote: warning: File odometry_pic_and_video/ndt_map.pcd is 92.26 MB; this is larger than GitHub's recommended maximum file size of 50.00 MB
To https://github.com/suyunzzz/aiimooc_lesson.git
   d6accd1..416617c  master -> master
Branch 'master' set up to track remote branch 'master' from 'origin'.

2、fatal: refusing to merge unrelated histories

这是因为远程仓库已经存在代码记录了，并且那部分代码没有和本地仓库进行关联，我们可以使用如下操作允许pull未关联的远程仓库旧代码：

git pull origin master --allow-unrelated-histories

然后我们可以push代码了

$ git pull origin  master
From https://github.com/suyunzzz/Airborn_PointCLoudGPF
 * branch            master     -> FETCH_HEAD
fatal: refusing to merge unrelated histories

11604@s MINGW64 ~/Desktop/science_code/GPF_修改 (master)
$ git pull origin master --allow-unrelated-histories
From https://github.com/suyunzzz/Airborn_PointCLoudGPF
 * branch            master     -> FETCH_HEAD
error: The following untracked working tree files would be overwritten by merge:
        README.md
Please move or remove them before you merge.
Aborting

11604@s MINGW64 ~/Desktop/science_code/GPF_修改 (master)
$

11604@s MINGW64 ~/Desktop/science_code/GPF_修改 (master)
$ git pull origin master --allow-unrelated-histories
remote: Enumerating objects: 3, done.
remote: Counting objects: 100% (3/3), done.
remote: Total 2 (delta 0), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (2/2), 585 bytes | 30.00 KiB/s, done.
From https://github.com/suyunzzz/Airborn_PointCLoudGPF
 * branch            master     -> FETCH_HEAD
   59035e0..50da614  master     -> origin/master
Already up to date!
Merge made by the 'recursive' strategy.

11604@s MINGW64 ~/Desktop/science_code/GPF_修改 (master)
$ git pull

11604@s MINGW64 ~/Desktop/science_code/GPF_修改 (master)
$ ^C

11604@s MINGW64 ~/Desktop/science_code/GPF_修改 (master)
$ git push
fatal: The current branch master has no upstream branch.
To push the current branch and set the remote as upstream, use

    git push --set-upstream origin master


11604@s MINGW64 ~/Desktop/science_code/GPF_修改 (master)
$  git push --set-upstream origin master

Enumerating objects: 6, done.
Counting objects: 100% (6/6), done.
Delta compression using up to 12 threads
Compressing objects: 100% (5/5), done.
Writing objects: 100% (5/5), 1.21 MiB | 407.00 KiB/s, done.
Total 5 (delta 1), reused 0 (delta 0), pack-reused 0
remote: Resolving deltas: 100% (1/1), done.
To https://github.com/suyunzzz/Airborn_PointCLoudGPF.git
   50da614..8778f7b  master -> master
Branch 'master' set up to track remote branch 'master' from 'origin'.