使用tortoiseGit进行分支的切换与合并
当前本地是develop分支
develop分支创建文件输入文字 提交
从gitlab检出sim分支
此时sim分支没有当前文件
从develop合并进入sim
![](https://img2020.cnblogs.com/blog/2017617/202104/2017617-20210409222604852-1428850576.png)
修改sim分支
![](https://img2020.cnblogs.com/blog/2017617/202104/2017617-20210409222634456-1550503507.png)
提交到sim分支
![](https://img2020.cnblogs.com/blog/2017617/202104/2017617-20210409222722642-574748284.png)
切换回develop分支
![](https://img2020.cnblogs.com/blog/2017617/202104/2017617-20210409222753150-1093505421.png)
这里任然是develop分支的内容
![](https://img2020.cnblogs.com/blog/2017617/202104/2017617-20210409222825559-480214544.png)
修改develop分支内容,提交
![](https://img2020.cnblogs.com/blog/2017617/202104/2017617-20210409222923630-1099216270.png)
切换到sim
从develop合并
解决冲突
提交到sim
切换回develop分支