If you have made any changes to your local version, you will have an option to merge these changes with the server version when you check in the files.

• 如果您对本地版本进行了任何更改,签入文件时可以选择将这些更改与服务器版本合并。