Git

 ! [rejected]        main -> main (fetch first)
error: failed to push some refs to 'github.com:r1Way/remote-repo.git'
hint: Updates were rejected because the remote contains work that you do not
hint: have locally. This is usually caused by another repository pushing to
hint: the same ref. If you want to integrate the remote changes, use
hint: 'git pull' before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

最佳实践

关联仓库时，本地先别提交，先拉取README.md，再push
删除远程库

git remote rm <remote_name>

分支

创建分支

git branch <branch name>

别忘记提交

查看分支

git branch

切换分支

git switch <branch name>

git checkout <branch name> (不好有歧义)

不同分支的文件内容在同一文件下，但用ls只能看到当前分支的内容（新分支会包含旧分支的文件）

合并分支

git merge <branch name>将该branch合并到本branch下，默认让我们进行一次提交

查看分支图

git log --graph --oneline --decorate --all

当main也有新的commit后，才容易看到合并的图像

分支被合并后不会消失

删除本地分支

若已经合并

git branch -d <branch name>

若未合并

git branch -D <branch name>

删除远程分支

git push origin --delete [branch_name]

刘星池@river-away MINGW64 ~/learn-git/branch-demo (main)
$ git log --graph --oneline --decorate --all
*   b334c02 (HEAD -> main) gerge branch 'other' merge the branch other
|\
| * f0db2b0 (other) commit other1.txt
* | fc0e809 commit main4.txt
|/
* 3618250 commit from branch dev
* 6dae08c first commit

刘星池@river-away MINGW64 ~/learn-git/branch-demo (main)
$ git log --oneline
b334c02 (HEAD -> main) gerge branch 'other' merge the branch other
fc0e809 commit main4.txt
f0db2b0 (other) commit other1.txt
3618250 commit from branch dev
6dae08c first commit

解决合并冲突

查看冲突文件

git status

查看冲突内容

git diff

此时冲突文件中会将两冲突同时显示在文件内

等号上方为当前branch（主干），下方为被合并的branch（侧枝）。

把左箭头，右箭头等号都去掉。然后保存后提交

终止合并

git merge --abort

回退和rebase

git rebase main将本分支到公共结点的提交记录变基到另一条分支上

git checkout -b dev <版本号> 恢复被删除的分支

alias graph="git log --oneline --graph --decorate --all" 来简化我们的命令

规范

版本号规则

git tab 标记版本号

更改Git起始目录

http://t.csdnimg.cn/BhONz

原为:

目标F:\Git\Git\git-bash.exe --cd-to-home

起始位置%HOMEDRIVE%%HOMEPATH%

改为F:\Git\Git\git-bash.exe

起始位置G:\inspire\simulator

注意是右斜线（反斜杠)

Trouble Shooting

`(use "git restore <file>..." to discard changes in working directory)`

$ git commit -m"commit error refer to the last time"
On branch temp
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
        modified:   ../project/.vs/project/v15/.suo
        modified:   ../project/.vs/project/v15/Browse.VC.db
        modified:   ../project/.vs/project/v15/ipch/AutoPCH/c8e138fe51f15a31/GATE.ipch
        modified:   ../project/project/Element.h
        modified:   ../project/project/Gate.h
        modified:   ../project/project/project.vcxproj
        modified:   ../project/project/project.vcxproj.filters
        modified:   ../project/project/project.vcxproj.user

Untracked files:
  (use "git add <file>..." to include in what will be committed)
        ../project/project/Event.h
        ../project/project/Time.h

no changes added to commit (use "git add" and/or "git commit -a")

解决

回到上一目录（project)，git add .才能将我所有的文件提交完。

打开`git log --oneline`后，无法退出

按q

git pull后因为conflict跟本地分支merge了

vi 修改冲突后，add commit，后main|MERGING就消失了

刘星池@river-away MINGW64 /g/know/src (main)
$ git pull
Auto-merging src/SUMMARY.md
CONFLICT (content): Merge conflict in src/SUMMARY.md
Automatic merge failed; fix conflicts and then commit the result.

刘星池@river-away MINGW64 /g/know/src (main|MERGING)
$ vi SUMMARY.md

刘星池@river-away MINGW64 /g/know/src (main|MERGING)
$ git add .

刘星池@river-away MINGW64 /g/know/src (main|MERGING)
$ git commit -m"deal merge"
[main 66f29ba] deal merge

刘星池@river-away MINGW64 /g/know/src (main)
$ git push

! [rejected] main -> main (non-fast-forward)

问题

To github.com:r1Way/work_manage.git
 ! [rejected]        main -> main (non-fast-forward)
error: failed to push some refs to 'github.com:r1Way/work_manage.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. If you want to integrate the remote changes,
hint: use 'git pull' before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

$ git pull origin main
From github.com:r1Way/work_manage
 * branch            main       -> FETCH_HEAD
fatal: refusing to merge unrelated histories

解决

你遇到的错误信息“fatal: refusing to merge unrelated histories”通常是因为本地和远程的 main 分支并没有共同的历史记录。这种情况通常在以下几种情况下发生：

你在本地仓库里创建了一个新的 Git 仓库，而远程仓库是一个全新的仓库，没有相同的提交历史。
远程仓库被重置过（例如，进行过 git reset --hard），导致其历史与本地的不同。

合并远程分支：使用以下命令来拉取远程分支并合并：

git pull origin main --allow-unrelated-histories

Vim

按到ctrl+c退出时

shell输入fg

set number! 显示行号
split水平线分割，vsplit竖直线分割