When there is a parent project, it have sub project; a project or below, just want to merge part of the path, and even the contents of the file, use the following methods can achieve the purpose, hereby record:
1. The main project right -> team -> remove from index (using the remove will remove the mark file conflicts, it is recommended to remove the conflict before finish changed, submit clean before recompiling the code, look at the code reported not being given)
2. then removed or not want to change the sub path items: right sub path or replacing head code
3. Right then Synchronize interface Overwrite, use to overwrite the current head of content changes (removing the contents of the file do not want to merge)
