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 difference between Git and SVN?
List out Git repository hosting services
How to create branch in git?
What is the use of ‘git log’?
What is a commit message?
How to resolve conflict in git?
What is a repository in Git?
What is 'Head' in Git and How to Create Heads in Repo - RRutors
What is the difference between git pull and git fetch?
How to delete branch in git?
How can you create a repository in Git?
What is mean by ‘git config’ ?
What is a ‘conflict’ in git?