Charles7c/vitepress-theme-blog-charles7c-s1
Archived
0
0
Fork 0
Code Issues 75 Pull Requests Actions Packages Projects Releases Wiki Activity

修复：文章图片路径错误

Browse Source
This commit is contained in:
Charles7c
2022-07-29 15:54:44 +08:00
parent 46fb63016d
commit 8b981bd364
6 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
repos/categories/fragments/2022/03/25.合并两个Git仓库的历史提交记录.md
View File

@@ -45,7 +45,7 @@ tags:
cd eladminx
```
![202203252252923](../../../public/img/2022/03/202203252252923.png)
![202203252252923](../../../../public/img/2022/03/202203252252923.png)
2. 将前端仓库作为后端仓库的远程仓库，起别名为 frontend（这个随便起）
@@ -53,7 +53,7 @@ tags:
git remote add -f frontend https://gitee.com/Charles7c/eladminx-web.git
```
![202203252252926](../../../public/img/2022/03/202203252252926.png)
![202203252252926](../../../../public/img/2022/03/202203252252926.png)
3. 将前端仓库的 master 分支（自己选择哪个分支）合并到后端仓库
@@ -61,7 +61,7 @@ tags:
git merge --strategy ours --no-commit frontend/master
```
![202203252252929](../../../public/img/2022/03/202203252252929.png)
![202203252252929](../../../../public/img/2022/03/202203252252929.png)
想法很美，但是报错了：
@@ -75,7 +75,7 @@ tags:
git merge --strategy ours --allow-unrelated-histories --no-commit frontend/master
```
![202203252252931](../../../public/img/2022/03/202203252252931.png)
![202203252252931](../../../../public/img/2022/03/202203252252931.png)
4. 将前端仓库的 master 分支内容放到在后端仓库内刚建好的 eladminx-web 文件夹中