git合并问题

Question

某个分支文件全部被重新提交了 然后合并的时候出现一堆冲突 请问如何处理。。

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.