ExamTopics Logo
Mail Us[email protected]
Menu
Lpi Discussions
exam questions

Exam 701-100 All Questions

View all questions & answers for the 701-100 exam
Go to Exam

Exam 701-100 topic 1 question 12 discussion

Actual exam question from LPI's 701-100
Question #: 12
Topic #: 1
[All 701-100 Questions]

What happens when a merge conflict occurs in git? (Choose two correct answers.)

  • 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.
Show Suggested Answer Hide Answer
Suggested Answer: DE 🗳️
by hythalo at Nov. 7, 2020, 1:44 p.m.

Comments

Chosen Answer:
This is a voting comment (?). It is better to Upvote an existing comment if you don't have anything to add.
Switch to a voting comment New
Submit Cancel
examtp1
9 months, 4 weeks ago
Selected Answer: BD
Per previous comments. Conflicts markers are added to files, and they are flagged as conflicted. E is not 100% correct, since conflicted files won't be the "newest". "newest" is also ambiguous, since you may be merging a branch that was developed years ago.
upvoted 2 times
...
hythalo
2 years, 8 months ago
What is wrong with the option "B. Conflict markers are added to the files."?
upvoted 3 times
...
Community vote distribution
A (35%)
C (25%)
B (20%)
Other
Most Voted
A voting comment increases the vote count for the chosen answer by one.

Upvoting a comment with a selected answer will also increase the vote count towards that answer by one. So if you see a comment that you already agree with, you can upvote it instead of posting a new comment.

SaveCancel