How can we resolve a merge conflict in GIT? All Questions › Category: Java › How can we resolve a merge conflict in GIT? 0 Vote Up Vote Down Vaishnavi Talawar asked 3 years ago