当前位置：网站首页>[problem handling] merge made by the 'ort' strategy

[problem handling] merge made by the 'ort' strategy

2022-07-23 22:14:00 【Less than xiansen】

git log see commit Record , Before the remote local conflict was found commit

git reset --soft [commitID]

git pull

Finished

版权声明
本文为[Less than xiansen]所创，转载请带上原文链接，感谢
https://yzsam.com/2022/204/202207231919148265.html