-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
6d1de90
commit 2f63c22
Showing
25 changed files
with
150 additions
and
15 deletions.
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,61 @@ | ||
--- | ||
title: Git-变基(rebase)和合并(merge)区别? | ||
order : 7 | ||
tag: | ||
- 踩坑记录 | ||
--- | ||
|
||
## 问题详情 | ||
|
||
<ChatMessage avatar="../../assets/emoji/bqb01.png" :avatarWidth="40"> | ||
Git-变基(rebase)和合并(merge)区别? | ||
</ChatMessage> | ||
|
||
## 解析 | ||
|
||
1. **合并(Merge):** | ||
- 合并是将两个分支的历史记录合并在一起,创建一个新的合并提交来整合两者的修改。 | ||
- 合并会保留原分支的完整历史记录,因此可以清晰地看到哪些修改来自于哪个分支。 | ||
- 合并会创建一个新的合并提交,这个提交有多个父节点,指向被合并的分支的最新提交和合并分支的最新提交。 | ||
|
||
``` | ||
o---o---o---o---o---o (分支A) | ||
\ / | ||
o---o---o (分支B) | ||
``` | ||
- 合并后: | ||
``` | ||
o---o---o---o---o---o---o (合并提交) | ||
\ / / | ||
o---o---o (分支A) (分支B) | ||
``` | ||
![](assets%2Fmerge.png) | ||
|
||
2. **变基(Rebase):** | ||
- 变基也是将两个分支的历史记录合并在一起,但与合并不同,它将当前分支的所有提交都应用在目标分支的最新提交上。 | ||
- 变基会使提交历史更加线性,避免了合并提交的产生,使得提交历史更加清晰。 | ||
- 变基可以提供一个更干净、整洁的提交历史,但可能会改写提交历史,因此不建议在公共分支上进行变基操作。 | ||
|
||
``` | ||
o---o---o---o---o---o (分支A) | ||
\ | ||
o---o---o (分支B) | ||
``` | ||
- 变基后: | ||
``` | ||
o---o---o---o---o---o (分支A) | ||
\ | ||
o---o---o (分支B) | ||
``` | ||
![](assets%2Frebase.png) | ||
|
||
## 总结 | ||
|
||
<ChatMessage avatar="../../assets/emoji/bqb (2).png" :avatarWidth="40"> | ||
再多说就不礼貌了 | ||
</ChatMessage> | ||
|
||
- **合并**会保留原分支的完整历史记录,创建一个新的合并提交。 | ||
- **变基**会将当前分支的所有提交都应用在目标分支的最新提交上,使提交历史更加线性。 | ||
|
||
![](assets%2Fqub.png) |
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
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 |
---|---|---|
@@ -0,0 +1,52 @@ | ||
--- | ||
title: HTTP | ||
order: 1 | ||
category: | ||
- 教程知识 | ||
--- | ||
<ChatMessage avatar="../../assets/emoji/dsyj.png" :avatarWidth="40"> | ||
官方出品必属精品 | ||
</ChatMessage> | ||
|
||
## 老生常谈 | ||
|
||
<ChatMessage avatar="../../assets/emoji/bqb (1).png" :avatarWidth="40"> | ||
什么是HTTP? | ||
</ChatMessage> | ||
|
||
>HTTP(超文本传输协议)是一种用于在互联网上传输信息的应用层协议。 | ||
| 协议 | 全称 | 描述 | | ||
|------------|----------------------------------------|----------------------------------------------------------------------------| | ||
| HTTP | Hyper Text Transfer Protocol | 用于从服务器传输超文本到本地浏览器的传送协议。 | | ||
| HTTPS | HyperText Transfer Protocol Secure | 一种通过计算机网络进行安全通信的传输协议,利用 SSL/TLS 加密数据包,提供身份认证和保护隐私与完整性。 | | ||
| 默认端口 | 80 | 443 | | ||
| URL 示例 | http:// | https:// | | ||
|
||
![](..%2Fassets%2Fhttp.jpeg) | ||
|
||
### HTTP请求操作 | ||
|
||
1. **GET**:用于从服务器获取指定资源的数据。GET 请求通常用于获取网页、图像、文本文件等。它是一个幂等操作,即多次发起相同的GET请求会产生相同的结果。 | ||
|
||
2. **POST**:用于向服务器提交数据,通常用于向服务器发送表单数据或上传文件。POST请求对提交的数据没有长度限制,且可以发送敏感信息(例如密码)。 | ||
|
||
3. **PUT**:用于向服务器上传数据,将指定资源的内容替换为请求中提供的数据。 | ||
|
||
4. **DELETE**:用于从服务器删除指定资源。 | ||
|
||
5. **HEAD**:与GET类似,但服务器只返回响应头部信息,而不返回实际内容主体。通常用于获取资源的元数据,而无需获取实际数据。 | ||
|
||
6. **OPTIONS**:用于获取服务器支持的HTTP方法列表。可以用来确定服务器支持哪些方法。 | ||
|
||
7. **PATCH**:用于部分更新资源,只更新资源的一部分内容。 | ||
|
||
8. **TRACE**:用于在请求-响应链上的代理服务器之间跟踪请求的传输。 | ||
|
||
9. **CONNECT**:用于将连接改为隧道,通常用于加密连接(例如TLS/SSL)的代理服务器。 | ||
|
||
10. **LINK** 和 **UNLINK**:用于在资源之间建立或取消链接关系。 | ||
|
||
## 测试工具 | ||
|
||
[在线测试](https://www.toolscat.com/dev/postman) |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 |
---|---|---|
@@ -0,0 +1,30 @@ | ||
--- | ||
title: 无法解析外部符号,无法解析外部命令 和命令“xxx”已退出。 | ||
order: 1 | ||
category: | ||
- 编译报错 | ||
--- | ||
## 问题描述 | ||
|
||
<ChatMessage avatar="../../assets/emoji/bqb (4).png" :avatarWidth="40"> | ||
写完代码,感觉自我良好,IDE也没报错,编译!——>报错! | ||
</ChatMessage> | ||
|
||
![builderror.jpg](..%2Fassets%2Fbuilderror.jpg) | ||
|
||
## 解决思路 | ||
|
||
1. **检查代码中的拼写和语法错误**: | ||
- 确保代码中没有拼写错误或语法错误,可能导致编译器无法识别符号。 | ||
|
||
2. **检查头文件和库的包含路径**: | ||
- 确保你在项目中正确包含了所需的头文件和库文件。 | ||
|
||
3. **确保依赖项正确链接**: | ||
- 确保项目正确链接了所需的库文件,一般情况下都是对应的`xxx.build.cs`没有引入模块依赖。 | ||
|
||
![build.jpg](..%2Fassets%2Fbuild.jpg) | ||
|
||
4. **重新生成项目文件**: | ||
- 在 UE 中,尝试删除 `Intermediate` 和 `Saved` 文件夹,然后重新生成项目文件。这将清除中间文件并尝试重新构建项目。 | ||
|
This file was deleted.
Oops, something went wrong.