如何在GIT中处理此合并问题

I am having a situation here. I did some commit to master branch and after move these commit to other branch x using andI am having a situation here. I did some commit