HomeQuestionsHow-can-you- resolve merge conflict if you are merging same projecta and in the same branch? How-can-you- resolve merge conflict if you are merging same projecta and in the same branch?By Ram / November 2, 2018 Discussion Room › Category: Interview Question › How-can-you- resolve merge conflict if you are merging same projecta and in the same branch? 0 Vote Up Vote Down Ram asked 6 years ago Post your answer..