git conflict handling

git conflict handling (it must be unsuccessful at this time):

1, revert (unimportant)

Or 2, submit the conflicting ones first (submit the conflicting ones first (or even reduce a blank line to submit)), then pull it again, then git will automatically merge the conflicts, then synchronize again, remove >>>> >>>>head etc.

You can then submit it directly

 

which is:

Conflict---merge commit---pull (there may be more conflicts at this time) and then commit

If there is a conflict, submit the conflict first, in the pull, then handle the conflict and then submit