Review the differences between the two file versions and choose the change you want to retain in the merge by selecting it.

• 查看两个文件版本之间的差异,并选择要在合并中保留的更改。