I have tried rebase and merge but both of them introduce conflicts which are very much for me to solve. My but both of them
阅读背景：
如何通过接受分支的更改将分支合并到主服务器中
来源：互联网
分享到：
