Categories

Oct 15, 2019 in Git
Q: What is a ‘conflict’ in git?

1 Answer

Oct 15, 2019
Git can handle on its own most merges by using its automatic merging features. There arises a conflict when two separate branches have made edits to the same line in a file, or when a file has been deleted in one branch but edited in the other. Conflicts are most likely to happen when working in a team environment.
Click here to read more about GIT
Click here to read more about Insurance

Related questions

Madanswer
Sep 5 in Git
Oct 26 in Git
Jul 25, 2019 in Git
...