When your sourcetree merge code conflicts, you cannot submit the code.
At this time, sourcetree will display merge conflicts. If you open your conflicting file, you will find that there are more things like this in it. >>>>>> --- <<<--- <<<
This contains your previous code and the code you pulled down. Check the following, and then delete the ones you don’t want.
If there is no ready-made example of merge conflict at hand, I will not take a screenshot. 🎜
The general process is that you first pull down the remote A branch, resolve the conflicts locally, and then submit to the remote A branch. That way the situation you mentioned won't happen.
![[Web front-end] Node.js quick start](https://img.php.cn/upload/course/000/000/067/662b5d34ba7c0227.png)
When your sourcetree merge code conflicts, you cannot submit the code.
If there is no ready-made example of merge conflict at hand, I will not take a screenshot. 🎜At this time, sourcetree will display merge conflicts. If you open your conflicting file, you will find that there are more things like this in it.
>>>>>>---<<<---<<<This contains your previous code and the code you pulled down. Check the following, and then delete the ones you don’t want.
Please see my article address:
/a/1190000002951154
The general process is that you first pull down the remote A branch, resolve the conflicts locally, and then submit to the remote A branch. That way the situation you mentioned won't happen.