How can we resolve merge conflicts in files?

We can rely on the git resolve commandBy checking out a previous commitWe can use a text editor to remove the version we don't want to keepWe can use a merge tool

Great! Git wouldn't know which versions to keep, which is why we need a merge tool or a text editor to resolve merge conflicts.

Nope! Git wouldn't know which versions to keep, which is why we need a merge tool or a text editor to resolve merge conflicts.