In both cases, because the resource file is in XML format, conflicts during check in can be resolved by merging.

• 这两种情况下,由于资源文件是XML格式,签入期间的冲突可通过合并来解决。