Obviously the people above think that just deleting it is enough. But this is really not a good idea. What if there are 100 conflicting lines. 1000 lines. So it is best to use the conflict resolution tool of the relevant IDE or a tool similar to Meld. For example, in webstorm, you can clearly see the comparison between remote and local conflicts, because many times conflicts are needed Keep the conflicting code, which is very common in team development where multiple people modify a file. So, don’t be so stupid and delete it directly. It's fine if it's one or two lines. You don’t have to use the way I said it, but you can’t help but know this approach.
Indicates that there is a conflict in the merge. Delete the first error (because the brackets after function cannot be in Chinese), and then delete the extra strange things
If there is a conflict in the automatic merge, you need to merge it manually.<<<<<<<HAED represents the content of your current branch, and that>>>>>front represents the content of the front branch. Just merge it yourself, then delete these things and submit again
![[Web front-end] Node.js quick start](https://img.php.cn/upload/course/000/000/067/662b5d34ba7c0227.png)
Obviously the people above think that just deleting it is enough. But this is really not a good idea. What if there are 100 conflicting lines. 1000 lines.
So it is best to use the conflict resolution tool of the relevant IDE or a tool similar to Meld. For example, in webstorm, you can clearly see the comparison between remote and local conflicts, because many times conflicts are needed Keep the conflicting code, which is very common in team development where multiple people modify a file. So, don’t be so stupid and delete it directly. It's fine if it's one or two lines.
You don’t have to use the way I said it, but you can’t help but know this approach.
Indicates that there is a conflict in the merge.
Delete the first error (because the brackets after function cannot be in Chinese), and then delete the extra strange things
If there is a conflict in the automatic merge, you need to merge it manually.<<<<<<<HAED represents the content of your current branch, and that>>>>>front represents the content of the front branch. Just merge it yourself, then delete these things and submit again
This is obviously a code conflict. Modify the content in >>>>> and it can be merged.