Resolve merge conflicts in git by using git commands and tools.

• Use 'git status' to identify conflicted files

• Open conflicted file(s) in text editor and resolve conflicts manually

• Use 'git add' to stage ...read more