qǐng / xiān / qiān rù / nǐ / de / dài mǎ / rán hòu / zài / jìn xíng / hé bìng请先签入你的代码,然后再进行合并。Please check in your code first, and then perform the merge.