Question 1 of 30
A software development team is collaborating on a project using Git for version control. They have a main branch called `main` and a feature branch called `feature-xyz`. After completing the feature, they want to merge `feature-xyz` into `main`. However, they notice that there are some changes in `main` that conflict with the changes made in `feature-xyz`. What is the best approach for resolving these conflicts before merging the branches?
Perform a merge from `main` into `feature-xyz`, resolve the conflicts, and then merge `feature-xyz` back into `main`.
Directly merge `feature-xyz` into `main` and let Git handle the conflicts automatically.
Delete the `feature-xyz` branch and start a new branch from `main` to implement the feature again.
Rebase `feature-xyz` onto `main`, resolve the conflicts, and then merge `feature-xyz` back into `main`.

Preparing for Microsoft 98-381 Introduction to Programming Using Python? 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