title: Best way to resolve conflicts in GIT
body: <p>Can anybody please explain what is the best to resolve conflicts in Git. I am currently using Tortoise Git as well as SourceTree. With TortoiseGit, after getting a conflict, we get the option to "resolve conflict using theirs" or "resolve conflict using mine" in both ways it is not working. What is the best practice?</p>