However, if the same lines were affected, Git cannot randomly pick one side over the other, and asks you to resolve the conflict. If these changes do not overlap (that is, changes were made to different lines of code), the conflicting files are merged automatically. When you work in a team, you may come across a situation when somebody pushes changes to a file you are currently working on.
