Deal of The Day! Hurry Up, Grab the Special Discount - Save 25% - Ends In 00:00:00 Coupon code: SAVE25
Welcome to Pass4Success

- Free Preparation Discussions
Mail Us support@pass4success.com
Location US
Mob_nav_barsMENU

LPI 701-100 Exam - Topic 12 Question 94 Discussion

What happens when a merge conflict occurs in git? (Choose two correct answers.)
D) The affected files are flagged as conflicting. and E) The newest version is placed in the local repository.
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.

LPI 701-100 Exam - Topic 12 Question 94 Discussion

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

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

Show Suggested Answer Hide Answer
Suggested Answer: D, E

by Monte at Aug 17, 2025, 11:54 PM

Limited Time Offer

25%

Off

Get Premium 701-100 Questions as Interactive Web-Based Practice Test or PDF

Contribute your Thoughts:

0/2000 characters
Submit Cancel
Louvenia
6 months ago
A new branch for remote changes? That’s new to me!
upvoted 0 times
...
Domonique
6 months ago
Wait, so the files stay unchanged? That sounds odd.
upvoted 0 times
...
Heidy
7 months ago
I think the affected files are flagged as conflicting too!
upvoted 0 times
...
Gail
7 months ago
Totally agree, those conflict markers are a lifesaver!
upvoted 0 times
...
Hannah
8 months ago
Conflict markers are definitely added to the files.
upvoted 0 times
...
Tina
8 months ago
I vaguely recall that a new branch isn't created during a merge conflict, but I can't remember what the right answers are.
upvoted 0 times
...
Simona
8 months ago
I practiced a question like this, and I feel like the conflicting files remain unchanged in the local repository is not correct.
upvoted 0 times
...
Fidelia
8 months ago
I'm not entirely sure, but I remember something about the affected files being flagged as conflicting. That might be one of the answers.
upvoted 0 times
...
Zachary
8 months ago
I think when a merge conflict happens, conflict markers are definitely added to the files. That sounds familiar.
upvoted 0 times
...
Jolanda
9 months ago
Ah, I remember this from the Git workshop. When a merge conflict occurs, the affected files are flagged, and the conflict markers are added. The local repository doesn't get updated with the remote changes until you resolve the conflict.
upvoted 0 times
...
Nan
9 months ago
Okay, let me think this through. I know the conflicting files are flagged, and the conflict markers are added to show the differences. I'm pretty sure the files don't get overwritten, so the local changes must remain unchanged.
upvoted 0 times
...
Lina
9 months ago
Hmm, I'm a bit unsure about this. I know the conflicting files remain unchanged in the local repo, but I can't remember if a new branch is created or if the files are just flagged as conflicting.
upvoted 0 times
...
Leota
9 months ago
I'm pretty confident about this one. When a merge conflict occurs, the conflicting files are flagged, and conflict markers are added to show the differences between the local and remote changes.
upvoted 0 times
...
Maryln
10 months ago
I think when a merge conflict occurs, the conflicting files remain unchanged in the local repository.
upvoted 0 times
...
Aleisha
10 months ago
B and D, for sure. But you know what would be really helpful? If Git could just magically resolve the conflicts for me. Where's the fun in that, though? *chuckles*
upvoted 0 times
...
Jody
10 months ago
Hah, E is a good one! Wouldn't it be nice if Git just automatically put the newest version in the local repo? That would make my life so much easier. *sigh*
upvoted 0 times
Beula
6 months ago
I think B and D are the right answers.
upvoted 0 times
...
Colene
7 months ago
True, but it could overwrite important changes too.
upvoted 0 times
...
Wynell
7 months ago
Yeah, that would be awesome! No more conflicts.
upvoted 0 times
...
Mireya
7 months ago
Agreed! Conflict markers help identify issues.
upvoted 0 times
...
...
Elroy
11 months ago
I'm pretty sure C is also correct. Git creates a new branch with the remote changes, right? Gotta keep track of all those versions, am I right?
upvoted 0 times
Vallie
10 months ago
B) Conflict markers are added to the files.
upvoted 0 times
...
Leonie
10 months ago
A) The conflicting files remain unchanged in the local repository.
upvoted 0 times
...
...
Minna
11 months ago
B and D are definitely the correct answers. Git clearly marks the conflicting sections in the files, and the affected files are flagged as conflicting. Easy peasy!
upvoted 0 times
Rodolfo
10 months ago
It's important to resolve merge conflicts properly.
upvoted 0 times
...
Marya
10 months ago
I agree, B and D are the correct answers.
upvoted 0 times
...
...

Save Cancel