To resolve the conflict in git, edit the files to fix the conflicting changes and then add the resolved files by running “git add” after that to commit the repaired merge, run “git commit”. Git remembers that you are in the middle of a merger, so it sets the parents of the commit correctly
What is a ‘conflict’ in git?
How to resolve conflict in git?
What is the difference between Git and SVN?
What is the use of ‘git log’?
What is mean by ‘git config’ ?
What is a repository in Git?
How to create branch in git?
How can you create a repository in Git?
What is 'Head' in Git and How to Create Heads in Repo - RRutors
How to delete branch in git?
What is a commit message?
List out Git repository hosting services
What is the difference between git pull and git fetch?