Automatic merge failed fix conflicts and then commit the result

Question

Hi,

I tried to merge in Git & GitHub. But I am getting the below error.

Can anyone tell me where I am doing wrong??

Thank You

Answer 1

Hi@Hasid,

There are two types of merging in Git & GitHub. One is automatic merge and another one is manual merge. When automatic merge fails then this error occurs. You can overcome this error by using manual merge. For that you can use mergetools. You can use meld, p4merge as a merge tool.

Thank You