小鹿线d5

git
git clone address

使用BASH

HUAWEI MateBook 14@DESKTOP-V0PTJVB MINGW64 ~
$ cd ~/.ssh

HUAWEI MateBook 14@DESKTOP-V0PTJVB MINGW64 ~/.ssh
$

HUAWEI MateBook 14@DESKTOP-V0PTJVB MINGW64 ~/.ssh
$ ssh-keygen -t rsa -C "859540029@qq.com"
Generating public/private rsa key pair.
Enter file in which to save the key (/c/Users/HUAWEI MateBook
/c/Users/HUAWEI MateBook 14/.ssh/id_rsa already exists.
Overwrite (y/n)? y
Enter passphrase (empty for no passphrase):
Enter same passphrase again:
Your identification has been saved in /c/Users/HUAWEI MateBoo
Your public key has been saved in /c/Users/HUAWEI MateBook 14
The key fingerprint is:
SHA256:J5GSy16RsHzthjqaWHlpLcQzCpUz69ZD+tj56BixU2c 859540029@
The key's randomart image is:
+---[RSA 3072]----+
|      .          |
|     o + +       |
|    = = * .      |
|   . * + =       |
|  . o X E +      |
|   o % X +       |
|    @ @ .        |
|   + % *         |
|  . =.*..        |
+----[SHA256]-----+

HUAWEI MateBook 14@DESKTOP-V0PTJVB MINGW64 ~/.ssh
$ ls
id_rsa  id_rsa.pub

HUAWEI MateBook 14@DESKTOP-V0PTJVB MINGW64 ~/.ssh
$ cat id_rsa.pub
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDQrJu0QIZXREJrgq7vnFlo0QFBLKhB+Q2+D13E/trmFast1GNlJQy7rSqzM8l/Qn/X/Hr5OGzjO44cRfx/F2VCoL488061BjBMDMGtOQah8y1p7d2JBgkIwfMvr3+sqn打乱了

HUAWEI MateBook 14@DESKTOP-V0PTJVB MINGW64 ~/.ssh
$ ^C

HUAWEI MateBook 14@DESKTOP-V0PTJVB MINGW64 ~/.ssh
$

HUAWEI MateBook 14@DESKTOP-V0PTJVB MINGW64 ~/game2048-for-fzy (master)
$ git add .

HUAWEI MateBook 14@DESKTOP-V0PTJVB MINGW64 ~/game2048-for-fzy (master)
$ git add .

HUAWEI MateBook 14@DESKTOP-V0PTJVB MINGW64 ~/game2048-for-fzy (master)
$ git commit -m 'update'
[master 928b0df] update
 1 file changed, 1 insertion(+), 1 deletion(-)

HUAWEI MateBook 14@DESKTOP-V0PTJVB MINGW64 ~/game2048-for-fzy (master)
$ git push\
>


HUAWEI MateBook 14@DESKTOP-V0PTJVB MINGW64 ~/game2048-for-fzy (master)
$ git push
Enumerating objects: 5, done.
Counting objects: 100% (5/5), done.
Delta compression using up to 16 threads
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 290 bytes | 290.00 KiB/s, done.
Total 3 (delta 2), reused 0 (delta 0), pack-reused 0
remote: Powered by GITEE.COM [GNK-5.0]
To https://gitee.com/kooklen/game2048-for-fzy.git
   cad412b..928b0df  master -> master

HUAWEI MateBook 14@DESKTOP-V0PTJVB MINGW64 ~/game2048-for-fzy (master)
$

如果a用户提交了代码，b在本地必须更新后才能push

git代码冲突问题怎么解决：

1.删除冲突报错
2.合并or删除代码

———————————————————————————————
上线代码：master
开发新功能：分支



————————————————————git flow————————