<<<<<<< HEAD
b789
=======
b45678910
>>>>>>> 6853e5ff961e684d3a6c02d4d06183b5ff330dcc
head 到 =======里面的b789是您的commit的内容
=========到 >>>>6853e.....的是您下拉的内容
tochw 2020-05-23 13:00 原文
<<<<<<< HEAD
b789
=======
b45678910
>>>>>>> 6853e5ff961e684d3a6c02d4d06183b5ff330dcc
head 到 =======里面的b789是您的commit的内容
=========到 >>>>6853e.....的是您下拉的内容