How can we resolve merge conflicts in files?
git resolve
commandGreat! 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.