How to abort the merge conflict in Git

+1 vote

Hi Guys,

I try to pull some files from the remote repository. But I ran into the merge conflict condition. How to avoid the merge conflict?

Dec 23, 2020 in Git & GitHub by akhtar
• 38,170 points
136 views

1 answer to this question.

0 votes

Hi@akhtar,

You can use the git reset --merge command. You can also use the git merge --abort command. As always, make sure you have no uncommitted changes before you start a merge.

answered Dec 23, 2020 by MD
• 95,060 points

Related Questions In Git & GitHub

0 votes
1 answer

How to do a re-merge into another branch in git

Seems like you want to rebase your ...READ MORE

answered May 7, 2018 in Git & GitHub by DareDev
• 6,890 points
807 views
0 votes
1 answer

How to install Git in the Ubuntu system?

Hi@akhtar, In the Ubuntu system, you can use ...READ MORE

answered Nov 19, 2020 in Git & GitHub by MD
• 95,060 points
48 views
0 votes
1 answer

How to set a username in the Git server?

Hi@akhtar, In the Git server, you need to ...READ MORE

answered Nov 19, 2020 in Git & GitHub by MD
• 95,060 points

edited Nov 19, 2020 by MD 40 views
0 votes
1 answer

How to find the hidden files in the Git repository?

Hi@akhtar, To find the hidden files in the ...READ MORE

answered Nov 19, 2020 in Git & GitHub by MD
• 95,060 points
191 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
943 views
+2 votes
1 answer
0 votes
1 answer
0 votes
1 answer

How to merge with squash in Git?

Hi@akhtar, If you want to merge your data ...READ MORE

answered May 13, 2020 in Git & GitHub by MD
• 95,060 points
112 views