What is a conflict?

1.	What is a conflict?
Answer» Git usually handles FEATURE merges automatically but sometimes while working in a team environment, there might be cases of CONFLICTS such as: 1. When two separate branches have changes to the same line in a file 2. A file is deleted in one branch but has been modified in the other. These conflicts have to be solved manually after discussion with the team as git will not be able to PREDICT what and WHOSE changes have to be given PRECEDENCE.

Discussion