in Git by
How do you define a ‘conflict’ in git?

1 Answer

0 votes
by

If you want to merge a commit there is a change in one place and same change already exists then while merging the Git will not be able to predict which is the change that needs to be taken precedence.

...