Question 1 of 30
In a software development project, a team is using a version control system (VCS) to manage their codebase. They have a main branch called `main` and a feature branch called `feature-xyz`. After completing the feature, the team decides to merge `feature-xyz` into `main`. However, during the merge process, they encounter a conflict in a file called `config.json`. What is the most effective approach for resolving this conflict while ensuring that the integrity of the codebase is maintained and that the changes from both branches are preserved?
Use a merge tool to manually resolve the conflict by reviewing the changes from both branches and selecting the appropriate lines to keep in `config.json`.
Automatically accept the changes from the `main` branch, discarding all modifications made in `feature-xyz`.
Delete the `config.json` file from both branches to eliminate the conflict entirely.
Revert the `feature-xyz` branch to the last commit before the conflict occurred and attempt the merge again.

Preparing for Microsoft 98-361 Software Development Fundamentals? Now land the interview.

73% of qualified candidates get rejected because of weak resumes. Build an ATS-optimized, recruiter-ready resume in under 5 minutes - free to start.

Build My Resume Free