### 添加上游仓库
`git remote add upstream https://gitee.com/spark-store-project/Spark-Update-Tool.git`
### 查看
```
momen@momen-ASUS:~/Desktop/momen-clone/spark-store$ git remote -v
origin  https://gitee.com/momen_official/spark-store.git (fetch)
origin  https://gitee.com/momen_official/spark-store.git (push)
spark-update-tool       https://gitee.com/spark-store-project/Spark-Update-Tool.git (fetch)
spark-update-tool       https://gitee.com/spark-store-project/Spark-Update-Tool.git (push)
upstream        https://gitee.com/spark-store-project/spark-store.git (fetch)
upstream        https://gitee.com/spark-store-project/spark-store.git (push)
```
### 获取上游dev更新
git fetch spark-update-tool dev
git merge spark-update-tool/dev

### 把远程代码合并到你的本地目录
`git subtree pull --prefix=Spark-Update-Tool spark-update-tool dev`

`git subtree pull --prefix=Spark-Update-Tool spark-update-tool dev --squash`不保留远程提交日志）

### 强制保留远程修改
`git reset --hard Spark-Update-Tool/dev`

仓库里套子仓库单独拉取上游代码

### 添加上游仓库
git remote add upstream https://gitee.com/spark-store-project/spark-store.git

### 查看
```
momen@momen-ASUS:~/Desktop/momen-clone/spark-store$ git remote -v
origin  https://gitee.com/momen_official/spark-store.git (fetch)
origin  https://gitee.com/momen_official/spark-store.git (push)
upstream        https://gitee.com/spark-store-project/spark-store.git (fetch)
upstream        https://gitee.com/spark-store-project/spark-store.git (push)
```

### 获取上游更新
`git fetch upstream`

### 合并上游主分支更新

`git checkout master`
`git merge upstream/master`


### 错误解决：
`致命错误：您尚未结束您的合并（存在 MERGE_HEAD）。 请在合并前先提交您的修改。取消当前合并（安全回退）`

解决方案：`git merge --abort`

强制清理：`git reset --merge`

回退到某提交ID：`git checkout e49f4baa87eb8f3adba1616ce018765faeb90d9d`

克隆仓库拉去上游代码

如图，直接被进入紧急模式
![image.png](/static/img/ac78c95c587f08f0fc227410909f3a97.image.webp)

下载ubuntu镜像或其他livecd进入桌面环境
`sudo blkid`

![image.png](/static/img/a2bcc842ed928ee2339d64bebde7bdb0.image.webp)

然后发现，sda1是efi,sda2是根分区

### 开始挂载redhat目录并修补`initramfs`

挂载EFI

`sudo mkdir -p /mnt/rhel/boot/efi`

`sudo mount /dev/sda1 /mnt/rhel/boot/efi`

挂载redhat分区

`sudo mkdir /mnt/rhel`

`sudo mount /dev/sda2 /mnt/rhel`


挂载 路径

`for i in /dev /proc /sys /run; do sudo mount -B $i /mnt/rhel$i; done`

进入redhat环境
`sudo chroot /mnt/rhel`

查看Redhat内核
`ls  /lib/modules/`

![image.png](/static/img/6290503161818a3e5c4bcdaecfb29bfe.image.webp)

此次选用`4.18.0-553.22.1.el8_10.x86_64`
内核

`KVER="4.18.0-553.22.1.el8_10.x86_64"`

生成initramfs

`dracut -f -v --add-drivers "hv_vmbus hv_storvsc hv_netvsc" /boot/initramfs-${KVER}.img ${KVER}`

生成完毕如图

![image.png](/static/img/e2a5fa321ad4b7673afb4d4501924794.image.webp)

退出chroot
`exit`

卸载挂载点
```
# 卸载系统虚拟文件系统
for i in /dev /proc /sys /run; do sudo umount /mnt/rhel$i; done

# 卸载 EFI 分区 (/dev/sda1)
sudo umount /mnt/rhel/boot/efi

# 卸载根分区 (/dev/sda2)
sudo umount /mnt/rhel
```
`sudo reboot`

开机`grub`选择内核为`4.18.0-553.22.1.el8_10.x86_64的即可`

![image.png](/static/img/4d620d2f951793fe27fc09f8ed6360e8.image.webp)

vmware迁移hyperv后，redhat无hyperv驱动导致无法开机

克隆目标仓库（B）

git clone https://gitee.com/momen_official/spark-store.git

cd spark-store


添加源仓库（A）作为远程

git remote add upstream https://gitee.com/spark-store-project/spark-store.git


获取源仓库内容

git fetch upstream


合并或重置

如果你要保持 B 完全跟 A 一样（覆盖），可以执行：

git reset --hard upstream/master


如果只是想同步更新（保留 B 的提交），可以：

git merge upstream/master


推送到 B

git push origin master --force

强制拉dev分支到本地
git reset --hard upstream/dev

fork仓库同步远程仓库

```bash
root@server-12:/home/server# virsh list #查看当前虚拟机列表
 Id   Name   State
----------------------
 7    esxi   running

root@server-12:/home/server# virsh autostart esxi #开启自启动
Domain 'esxi' marked as autostarted
```

取消自启动：`virsh autostart --disable <虚拟机名称>`