-
Notifications
You must be signed in to change notification settings - Fork 33
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
core: --20220330 re-build folder struct
- Loading branch information
Jacob953
committed
Mar 30, 2022
1 parent
f68af69
commit 285279c
Showing
19 changed files
with
46 additions
and
49 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| [> Back](../../README.md#2-项目目录) | ||
| [> Back](/README.md#2-项目目录) | ||
|
|
||
| ## 通用技巧 | ||
|
|
||
|
|
||
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,7 +4,6 @@ | |
| 本指南本着以简易明了的语言向 Git & Github 新手解释基本概念与流程，如有错误和疏漏，请以谅解和更改。 | ||
|
|
||
| 更多 Git 相关操作，请参考 [Git Helper](./git-helper/README.md) | ||
| <!-- TOC --> | ||
|
|
||
| - [Git 新手指南](#git-新手指南) | ||
| - [零、理解基础概念](#零理解基础概念) | ||
|
|
@@ -28,8 +27,6 @@ | |
| - [查看提交的修改](#查看提交的修改) | ||
| - [撤回提交的修改](#撤回提交的修改) | ||
|
|
||
| <!-- /TOC --> | ||
| -------------------- | ||
| ## 零、理解基础概念 | ||
| Git 中需要理解基础概念： | ||
| - [工作区](#工作区) | ||
|
|
@@ -82,27 +79,27 @@ Git 仓库分为两类仓库：本地仓库和远程仓库。 | |
|
|
||
| 1. 在目标仓库点击 `Fork` 按钮，可以生成一个属于自己的同名仓库，并与上游仓库关联。 | ||
|
|
||
|  | ||
|  | ||
|
|
||
| 2. 操作后，可以在自己的主页看到克隆的仓库 | ||
| 1. 操作后，可以在自己的主页看到克隆的仓库 | ||
|
|
||
|  | ||
|  | ||
|
|
||
| ### 克隆代码到本地 | ||
|
|
||
| 1. 进入自己的仓库后，点击绿色的 `Code` 按钮，获取本仓库的 SSH 链接。 | ||
|
|
||
| **注意**：使用 SSH 链接需要先在本地主机上和自己的Github账户上，部署 SSH key 免密登入。该步骤可参考网络教程或官方教程 [Connecting to GitHub with SSH](https://docs.github.com/en/authentication/connecting-to-github-with-ssh) 完成。 | ||
|
|
||
|  | ||
|  | ||
|
|
||
| 2. 在你打算存放该代码仓库的目录下，打开 `Git Bash` 终端，输入命令,即可在本地获取到对应代码仓库，并自动与远程仓库关联。 | ||
| 1. 在你打算存放该代码仓库的目录下，打开 `Git Bash` 终端，输入命令,即可在本地获取到对应代码仓库，并自动与远程仓库关联。 | ||
| ``` | ||
| git clone [email protected]:<github_account>/<repository_name.git> | ||
| e.g. git clone [email protected]:the-fall-moon/evalcsu.git | ||
| ``` | ||
|
|
||
|  | ||
|  | ||
|
|
||
| ### 创建自己的分支 | ||
|
|
||
|
|
@@ -143,25 +140,25 @@ git remote add upstream_name [email protected]:github_account/<repository_name.git> | |
| e.g. git remote add upstream [email protected]:jacob953/evalcsu.git | ||
| ``` | ||
|
|
||
|  | ||
|  | ||
|
|
||
| 2. 去上游仓库拉取一次你所需保持跟踪的分支 upstream/main 。 | ||
| 1. 去上游仓库拉取一次你所需保持跟踪的分支 upstream/main 。 | ||
| ``` | ||
| git fetch <upstream_name> <branch_name> | ||
| e.g. git fetch upstream main | ||
| ``` | ||
|
|
||
|  | ||
|  | ||
|
|
||
| 3. 将 upstream/main 设置为你**当前分支**所要跟踪的远程仓库分支。 | ||
| 1. 将 upstream/main 设置为你**当前分支**所要跟踪的远程仓库分支。 | ||
| ``` | ||
| git branch -u <upstream_name>/<branch_name> | ||
| e.g. git branch -u upstream/main | ||
| ``` | ||
|
|
||
|  | ||
|  | ||
|
|
||
| 4. 在**设置过的分支**使用 git pull 命令简化拉取最新版本的操作。 | ||
| 1. 在**设置过的分支**使用 git pull 命令简化拉取最新版本的操作。 | ||
|
|
||
| ### 提交修改到远程仓库 | ||
|
|
||
|
|
@@ -177,9 +174,9 @@ eg: git push origin | |
|
|
||
| 1. 打开 GitHub，从个人仓库中选择 `New pull request` 按钮 | ||
|
|
||
|  | ||
|  | ||
|
|
||
| 2. 选取本仓库的主分支与你修改过的分支作为比较对象，依照以下方式描述你的修改： | ||
| 1. 选取本仓库的主分支与你修改过的分支作为比较对象，依照以下方式描述你的修改： | ||
| 1. 在**标题栏**中按照 `<type>[optional scope]: <description>` 的方式命名标题，要求简洁明了，不可缺失 | ||
| 2. 在 **Related Issue** 中链接到相关 Issue，不可缺失 | ||
| 3. 在 **Propose changes** 中简述你的改动，不可缺失 | ||
|
|
@@ -188,9 +185,9 @@ eg: git push origin | |
| 6. 在 **Screenshoot** 中贴上对应截图 | ||
| 7. 在 **Reviewers** 处添加数个检查者 | ||
|
|
||
|  | ||
|  | ||
|
|
||
| 3. 点击 `Create pull request` 按钮创建你的合并请求 | ||
| 1. 点击 `Create pull request` 按钮创建你的合并请求 | ||
|
|
||
| ## 二、部分常用的 git 命令补充 | ||
| ### 初始化 | ||
|
|
||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.