Question 1 of 30
In a collaborative software development project, a team is using a version control system (VCS) to manage their codebase. The team has two branches: `main` and `feature`. The `feature` branch is created for developing a new feature, and it has diverged from the `main` branch. After several commits on both branches, the team decides to merge the `feature` branch back into `main`. During the merge process, they encounter a conflict in a file called `config.json`. What is the best approach for resolving this conflict while ensuring that the integrity of both branches is maintained and that the new feature is integrated correctly?
Use a merge tool to manually resolve the conflict, ensuring that both the changes from the `feature` branch and the necessary updates from the `main` branch are included in `config.json`.
Discard the changes from the `feature` branch and keep only the `main` branch's version of `config.json` to avoid complications.
Automatically accept the changes from the `feature` branch without reviewing them, as they are the latest changes.
Create a new branch from `main`, apply the changes from `feature`, and then delete the `feature` branch to simplify the history.

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