1, when prompted to commit out of date:
First update file error, resolve conflicts and then commit
2, when a local update repository and conflict:
tc - version library
mc - use the local version
1, when prompted to commit out of date:
First update file error, resolve conflicts and then commit
2, when a local update repository and conflict:
tc - version library
mc - use the local version