git merge problem

Question

All files in a certain branch have been resubmitted, and then there are a lot of conflicts during the merge. Please tell me how to deal with it. .

Answer 1

I think this kind of problem can be solved by Baidu, or you can find the answer by referring to git information.

I think before asking a question, it's best to try to solve it yourself. If you really can't solve it, go to the forum for help; instead of thinking about getting something for nothing. Here is an article about how to ask questions intelligently, I hope you can learn from it.