如果我要merge一个项目的代码，项目比较大，上次merge是去年的时候做的，现在merge必然出上百个冲突，如果是一个人merge的话，冲突是在那个人本地的机器上的，有没有什么办法可以让多个人一起来解决冲突
After executiongit merge, send the conflicting files to everyone in folders, and put them back after modification.
git merge
![[Web front-end] Node.js quick start](https://img.php.cn/upload/course/000/000/067/662b5d34ba7c0227.png)
After execution
git merge, send the conflicting files to everyone in folders, and put them back after modification.