Automatic merge failed fix conflicts and then commit the result

0 votes

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

Jan 31, 2020 in Git & GitHub by Hasid
• 370 points
419 views

1 answer to this question.

0 votes

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

answered Feb 2, 2020 by MD
• 95,040 points

Related Questions In Git & GitHub

0 votes
2 answers

What's the difference between git push and git commit?

I installed ubuntu on vagrant and gave ...READ MORE

answered Jan 2, 2019 in Git & GitHub by Ali
• 11,300 points
1,008 views
0 votes
1 answer

How to solve the ‘Git commit -a error’?

This happens when no editor is set. ...READ MORE

answered Jul 5, 2018 in Git & GitHub by Tyrion anex
• 8,650 points
711 views
0 votes
1 answer

How to forcefully commit a file to Git even if the file is ruled as unchanged?

This is simple, just follow the below ...READ MORE

answered Jul 11, 2018 in Git & GitHub by Sophie may
• 10,530 points
1,332 views
0 votes
3 answers

Change commit message after committing and before push.

You also can use git filter-branch for that. git filter-branch ...READ MORE

answered Sep 6, 2018 in Git & GitHub by lina
• 8,220 points
897 views
+15 votes
2 answers

Git management technique when there are multiple customers and need multiple customization?

Consider this - In 'extended' Git-Flow, (Git-Multi-Flow, ...READ MORE

answered Mar 26, 2018 in DevOps & Agile by DragonLord999
• 8,450 points
965 views
+2 votes
1 answer
0 votes
1 answer
0 votes
1 answer