MENU
What happens when a merge conflict occurs in git? (Choose two correct answers.)
Suggested Answer: D, E
Get Premium 701-100 Questions
as Interactive Web-Based Practice Test or PDF
Real Exam Format
Detailed Explanations
Instant Access
Get Your Practice Test
26 comments · newest first
LO
Louvenia
9 months ago
A new branch for remote changes? That’s new to me!
DO
Domonique
9 months ago
Wait, so the files stay unchanged? That sounds odd.
HE
Heidy
10 months ago
I think the affected files are flagged as conflicting too!
GA
Gail
10 months ago
Totally agree, those conflict markers are a lifesaver!
HA
Hannah
11 months ago
Conflict markers are definitely added to the files.
TI
Tina
11 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.
SI
Simona
11 months ago
I practiced a question like this, and I feel like the conflicting files remain unchanged in the local repository is not correct.
FI
Fidelia
11 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.
ZA
Zachary
11 months ago
I think when a merge conflict happens, conflict markers are definitely added to the files. That sounds familiar.
JO
Jolanda
12 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.
NA
Nan
12 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.
LI
Lina
1 year 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.
LE
Leota
1 year 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.
MA
Maryln
1 year ago
I think when a merge conflict occurs, the conflicting files remain unchanged in the local repository.
AL
Aleisha
1 year 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*
JO
Jody
1 year 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*
BE
Beula
9 months ago
I think B and D are the right answers.
CO
Colene
10 months ago
True, but it could overwrite important changes too.
WY
Wynell
10 months ago
Yeah, that would be awesome! No more conflicts.
MI
Mireya
10 months ago
Agreed! Conflict markers help identify issues.
EL
Elroy
1 year 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?
VA
Vallie
1 year ago
B) Conflict markers are added to the files.
LE
Leonie
1 year ago
A) The conflicting files remain unchanged in the local repository.
MI
Minna
1 year 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!
RO
Rodolfo
1 year ago
It's important to resolve merge conflicts properly.
MA
Marya
1 year ago
I agree, B and D are the correct answers.