how to

choose Conflicts in rebase

Jun 2, 2024
softwares-and-toolsgitconflict
1 Minutes
58 Words

choose Conflicts in rebase

default

情况:origin/main 上别人有新 push,本地 main 上自己有 commit,pull with rebase 时发生冲突 打开 vscode 合并冲突界面,左边是 origin/main,右边是本地的新 commit

测试完了,确实是这样。

Article title:choose Conflicts in rebase
Article author:Julyfun
Release time:Jun 2, 2024
Copyright 2025
Sitemap