A ‘conflict’ arises when the commit that has to be merged has some change in one place, and the current commit also has a change at the same place. Git will not be able to predict which change should take precedence
What is the use of ‘git log’?
List out Git repository hosting services
What is mean by ‘git config’ ?
How to delete branch in git?
What is the difference between git pull and git fetch?
What is a ‘conflict’ in git?
How to create branch in git?
What is a commit message?
How can you create a repository in Git?
What is a repository in Git?
What is the difference between Git and SVN?
What is 'Head' in Git and How to Create Heads in Repo - RRutors
How to resolve conflict in git?