UiPath-ADAv1 Version Control and Libraries Practice Question
A developer is merging a feature branch into the main branch in Git. A merge conflict occurs in the 'project.json' file. What is the best way to handle this?
⚠ Common exam trap
Candidates often accept one entire version of the file or use a blanket overwrite, completely ignoring that JSON syntax must remain strictly valid to prevent crashing Studio.
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 file to resolve conflicts and verify the JSON syntax.
Merge conflicts in project.json often occur due to dependency updates or workflow additions happening simultaneously on different branches. The developer must manually review the file to ensure both branches' requirements are merged correctly without breaking the JSON structure. Using a dedicated Git merge tool or Studio's built-in Git integration to resolve these conflicts carefully is necessary to maintain the project's integrity before committing the final merged state.
Answer analysis
Option-by-option breakdown
For each option: why learners choose it and why it is or isn't the right answer here.
- ✗
Delete the project.json file and create a new one.
Why it's wrong here
Deleting project.json destroys the project configuration, including dependencies, entry points, and project metadata. This will break the project completely. You must always repair the existing file rather than replacing it, as it contains critical information required for Studio and Orchestrator to interpret the automation project correctly.
- ✓
Manually edit the file to resolve conflicts and verify the JSON syntax.
Why this is correct
Manual resolution requires careful attention to the JSON schema. By removing conflict markers (<<<<, ===, >>>>) and ensuring valid JSON, the developer preserves the project metadata. This is the safest way to reconcile conflicting configurations while ensuring the project remains fully functional and compatible with the UiPath environment.
- ✗
Revert the merge and abandon the feature branch.
Why it's wrong here
Abandoning work due to a merge conflict is unnecessary. Merge conflicts are a standard part of collaborative development. Learning how to resolve them is a core skill for automation developers. Abandoning the branch leads to wasted effort and prevents the delivery of the intended feature update.
- ✗
Force the merge using the 'theirs' strategy.
Why it's wrong here
Using a 'theirs' strategy blindly overwrites the main branch with the feature branch's metadata. This could inadvertently remove dependencies or configuration settings required by the main branch, leading to a broken production environment. A manual merge is always preferred to ensure both sets of project requirements are satisfied.
Visual reference
About these practice questions
One of 285 original UiPath-ADAv1 practice questions on Courseiva, each with a full explanation and wrong-answer analysis — not exam dumps or protected exam content. 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 September 2026 · checked against the official UiPath exam blueprint
This UiPath-ADAv1 practice question is part of Courseiva's free UiPath 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 UiPath-ADAv1 exam.