The operation could not be performed because of one or more tree conflicts.
The files .gitignore, xxx.plist, aaa.h, aaa.m, and aaa.xib had a tree conflict.
There is a code conflict in these files. Manually maintain the conflict and then continue. It is recommended to use a client such as source tree to do this.
![[Web front-end] Node.js quick start](https://img.php.cn/upload/course/000/000/067/662b5d34ba7c0227.png)
There is a code conflict in these files. Manually maintain the conflict and then continue. It is recommended to use a client such as source tree to do this.