How to abort the merge conflict in Git

Question

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?

Answer 1

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.