In intellj idea, how can the git project see the differences and conflicts between the server code and the local code submitted by others like eclipse, so that I can resolve the conflicts in advance and then update others' latest code.
Like +0
![[Web front-end] Node.js quick start](https://img.php.cn/upload/course/000/000/067/662b5d34ba7c0227.png)
光阴似箭催人老，日月如移越少年。