What happens when a merge conflict occurs in git?
A) The conflicting files remain unchanged in the local repository.
B) Conflict markers are added to the files.
C) A new branch containing the remote changes is created.
D) The affected files are flagged as conflicting.
E) The newest version is placed in the local repository.
Correct Answer:
Verified
Q2: Which of the following container names could
Q3: Which Ansible keyword is used in a
Q4: Which of the following commands lists the
Q5: What is the Puppet equivalent to an
Q6: What implications does container virtualization have for
Q7: A declarative Jenkins pipeline contains the following
Q8: Which of the following mechanisms are used
Q9: Which of the following statements are true
Q10: The file index.php , which is being
Q11: If a Dockerfile references the container's base
Unlock this Answer For Free Now!
View this answer and more for free by performing one of the following actions
Scan the QR code to install the App and get 2 free unlocks
Unlock quizzes for free by uploading documents