Question 1 of 30
In a Salesforce development environment, a team is using Git for version control to manage their codebase. They have a branching strategy where the main branch is used for production-ready code, while feature branches are created for new developments. After completing a feature, the team needs to merge the feature branch back into the main branch. However, they encounter a situation where there are conflicting changes between the feature branch and the main branch. What is the most effective approach for resolving these conflicts while ensuring that the integrity of the main branch is maintained?
Perform a merge operation and resolve conflicts manually, ensuring that all changes are reviewed and tested before finalizing the merge.
Discard the feature branch changes and directly update the main branch with the latest changes from the remote repository.
Rebase the feature branch onto the main branch and force push the changes to overwrite the main branch.
Create a new branch from the main branch, cherry-pick the necessary commits from the feature branch, and merge this new branch into the main branch.

Preparing for SalesForce Certified Development Lifecycle and Deployment Designer Certified Development Lifecycle and Deployment Designer? 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