JNCIA-DevOps Junos Automation Stack And DevOps Concepts Practice Question
A network engineer is using Git for version control of Junos configurations. During a peer review on a pull request, a merge conflict arises because two engineers modified the same interface description line in different branches. What is the correct procedure to resolve this conflict in Git?
Answer choices
Why each option matters
Answer the question above first, then reveal the full breakdown to understand why each option is right or wrong.
Correct answer & explanation
✓
Manually edit the conflict markers in the affected configuration file, stage the resolved file, and complete the merge commit.
Git marks the conflicting lines in the file, requiring manual editing to choose the correct changes or combine them, followed by staging and committing the resolution.
Answer analysis
Option-by-option breakdown
For each option: why learners choose it and why it is or isn't the right answer here.
- ✗
Reboot the Junos routing engine to clear the Git repository cache and force a fast-forward merge.
Why it's wrong here
Junos routing engine reboots have no effect on Git version control merge operations.
- ✗
Run the 'git force-merge' command to automatically discard the older branch's changes.
Why it's wrong here
No such command as 'git force-merge' exists.
- ✗
Use 'git reset --hard' on the remote repository to delete both conflicting branches entirely.
Why it's wrong here
Resetting hard destroys work and does not resolve merge conflicts collaboratively.
- ✓
Manually edit the conflict markers in the affected configuration file, stage the resolved file, and complete the merge commit.
Why this is correct
Correct. Merge conflicts require manual intervention using conflict markers (<<<<, ====, >>>>), then staging and committing.
Visual reference
About these practice questions
Courseiva writes every JNCIA-DevOps question from scratch — 307 in total, each with an explanation and a wrong-answer breakdown. None are copied from real exams or dumps. Learn why practice questions differ from exam dumps →
JA
Written and reviewed by Johnson Ajibi, MSc IT Security
Senior Network & Security Engineer · founder of Courseiva
Last reviewed August 2026 · checked against the official Juniper Networks exam blueprint
This JNCIA-DevOps practice question is part of Courseiva's free Juniper Networks certification practice question bank. Courseiva provides original exam-style practice questions with explanations, topic-based practice, mock exams, readiness tracking, and study analytics to help learners prepare for the JNCIA-DevOps exam.