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
How can you create a repository in Git?
What is the use of ‘git log’?
What is a ‘conflict’ in git?
What is a commit message?
How to delete branch in git?
What is the difference between Git and SVN?
What is mean by ‘git config’ ?
What is ‘head’ in git and how many heads can be created in a repository?
How to create branch in git?
What is the difference between git pull and git fetch?
List out Git repository hosting services
How to resolve conflict in git?
What is a repository in Git?