版本控制Git 黑马&尚硅谷

从基本的环境配置与安装到Git的基本操作,轻松应对Git在使用时遇到的常见问题。
02_版本控制器的方式


03_svn(过时)_git


04git工作流程简述

05git环境配与安装






06 获取本地仓库

Git命令行 复制方式:鼠标选;粘贴方式:点击鼠标滚轮
07_git常用指令【补充】工作区、暂存区、版本库







08 git基础命令练习


09_git分支_常用指令

10解决冲突

11分支使用流程


12分支练习

13_补充_强制删除分支的场景

修改还没保存,Git认为有可能误操作,所以不能删除;
要用强制删除: git branch -D 名字 不做任何检查,强制删除
14_上午总结

15_补充合并的快进模式(Fast-forward)

16仓库托管_注册创建仓库配置公钥
感觉Git在团队协作 代码管理 还是很重要的,这个老师讲的太快 转战尚硅谷辣1

尚硅谷21 GitHub_创建远程库&创建别名





推送本地库到远程库

拉取远程库到本地库




远程更改之后 pull(拉取)到本地分支

克隆远程库到本地(不需要登录)

团队内协作



跨团队协作









SSH免密登录
登录不了GitHub解决方案:http://mijiguihb.cn/yy/4844.html

没搞成功各种报错

removed directory '.ssh'
--运行命令生成.ssh 秘钥目录[注意:这里-C 这个参数是大写的 C]
Layne@LAPTOP-Layne MINGW64 ~
$ ssh-keygen -t rsa -C atguiguyueyue@aliyun.com
Generating public/private rsa key pair.
Enter file in which to save the key (/c/Users/Layne/.ssh/id_rsa):
Created directory '/c/Users/Layne/.ssh'.
Enter passphrase (empty for no passphrase):
Enter same passphrase again:
Your identification has been saved in /c/Users/Layne/.ssh/id_rsa.
Your public key has been saved in /c/Users/Layne/.ssh/id_rsa.pub.
The key fingerprint is:
SHA256:7CPfRLITKcYDhaqpEDeok7Atvwh2reRmpxxOC6dkY44
atguiguyueyue@aliyun.com
The key's randomart image is:
+---[RSA 2048]----+
| .. |
| .. |
| . .. |
|+ + o . . |
|oO . = S . |
|X . .. + = |
|+@ * .. = . |
|X.&o+. o = |
|Eo+Oo . . |
+----[SHA256]-----+
--进入.ssh 目录查看文件列表
Layne@LAPTOP-Layne MINGW64 ~
$ cd .ssh
Layne@LAPTOP-Layne MINGW64 ~/.ssh
$ ll -a
total 21
drwxr-xr-x 1 Layne 197609 0 11 月 25 19:27 ./
drwxr-xr-x 1 Layne 197609 0 11 月 25 19:27 ../ -rw-r--r-- 1 Layne 197609 1679 11 月 25 19:27 id_rsa
-rw-r--r-- 1 Layne 197609 406 11 月 25 19:27 id_rsa.pub
--查看 id_rsa.pub 文件内容
Layne@LAPTOP-Layne MINGW64 ~/.ssh
$ cat id_rsa.pub
ssh-rsa
AAAAB3NzaC1yc2EAAAADAQABAAABAQDRXRsk9Ohtg1AXLltsuNRAGBsx3ypE1O1Rkdzpm
l1woa6y6G62lZri3XtCH0F7GQvnMvQtPISJFXXWo+jFHZmqYQa/6kOIMv2sszcoj2Qtwl
lGXTPn/4T2h/cHjSHfc+ks8OYP7OWOOefpOCbYY/7DWYrl89k7nQlfd+A1FV/vQmcsa1L
P5ihqjpjms2CoUUen8kZHbjwHBAHQHWRE+Vc371MG/dwINvCi8n7ibI86o2k0dW0+8SL+
svPV/Y0G9m+RAqgec8b9U6DcSSAMH5uq4UWfnAcUNagb/aJQLytrH0pLa8nMv3XdSGNNo
AGBFeW2+K81XrmkP27FrLI6lDef atguiguyueyue@aliyun.com
复制 id_rsa.pub 文件内容,登录 GitHub,点击用户头像→Settings→SSH and GPG keys


27 IDEA集成Git 环境准备



# Compiled class file
*.class
# Log file
*.log
# BlueJ files
*.ctxt
# Mobile Tools for Java (J2ME)
.mtj.tmp/
# Package Files #
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar
# virtual machine crash logs, see
http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
.classpath
.project
.settings
target
.idea
*.iml

Layne@LAPTOP-Layne MINGW64 /d/Git-Space/SH0720 (master)
$ git config --global user.name Layne
Layne@LAPTOP-Layne MINGW64 /d/Git-Space/SH0720 (master)
$ git config --global user.email Layne@atguigu.com
Layne@LAPTOP-Layne MINGW64 /d/Git-Space/SH0720 (master)
$ cat ~/.gitconfig
[user]
name = Layne
email = Layne@atguigu.com

2)在.gitconfig 文件中引用忽略配置文件(此文件在 Windows 的家目录中)
[user]
name = Layne
email = Layne@atguigu.com
[core]
excludesfile = C:/Users/asus/git.ignore
注意:这里要使用“正斜线(/)”,不要使用“反斜线(\)”

初始化&添加&提交

7.4 添加到暂存区:
右键点击要添加的项目选择 Git -> Add 将项目添加到暂存区。



切换版本

创建分支&切换分支




合并分支(正常合并)

合并分支(冲突合并)


点击 Conflicts 框里的 Merge 按钮,进行手动合并代码


33 IDEA集成GitHub 设置GitHub账号



分享项目到GitHub账号


push推送代码到GitHub



拉取远程库代码合并本地库
最新的代码先PULL到本地,再改然后push


克隆代码到本地

码云_账号注册登录&创建远程库



码云IDEA集成Gitee码云


push不成功: Push rejected Push to origing/master was rejecte

给远程库链接定义个 name,然后再 URL 里面填入码云远程库的 HTTPS 链接即可。码云服务器在国内,用 HTTPS 链接即可,没必要用 SSH 免密链接。

码云_将GitHub项目导入到Gitee



41 GitLab 简介和安装环境准备

GitLab感觉现在这个阶段用不到,有缘再见!
【尚硅谷Git入门到精通全套教程(涵盖GitHub\Gitee码云\GitLab)】https://www.bilibili.com/video/BV1vy4y1s7k6?p=39&vd_source=5475f4f6010a81c8e6d4789af8e1a20f
GitLab_安装&初始化服务&启...
GitLab_登录GitLab并创建远...
GitLab IDEA集成GitLab
45 课程总结
本文来自博客园,作者:软工菜鸡,转载请注明原文链接:https://www.cnblogs.com/SElearner/p/17676692.html