Git & GitHub Setup for MLOps -1
Git & GitHub Setup for MLOps Q1. Conflict in GIT When does a conflict arise in git? Choose the correct answer from below: A. Always when 2 developers raise pull requests simultaneously. B. Always when 2 developers change the project simultaneously. C. When the same line of code of a particular file is changed, in 2 different merging branches A and B. D. When the same file is deleted in 2 branches A and B, and we are trying to merge them. Ans: D Correct Option : When the same line of code of a particular file is changed, in 2 different merging branches A and B. Explanation : Conflicts generally arise when two people have changed the same lines in a file, or if one developer deleted a file while another developer was modifying it. In these cases, Git cannot automatically determine what is correct. Conflicts only affect the developer conducting the merg