git - source tree 代码冲突如何解决

Question

推送到git hub上的代码修改过，和以前的版本不一致，source tree会出现代码冲突的提醒，怎么解决

Answer 1

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. 🎜

Answer 2

Please see my article address:
/a/1190000002951154

Answer 3

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.