Answer-first summary for fast verification
Answer: Halt pulls from the main branch and rebase the feature branch.
Option D is the best approach for resolving the merge conflicts with minimal development effort. By stopping the pull from the main branch to the feature branch, the developer can prevent new conflicts from being introduced while resolving the existing ones. Rebasing the feature branch onto the main branch replays the feature branch's changes on top of the main branch's latest changes, allowing the developer to handle conflicts one commit at a time. This approach simplifies the resolution process and minimizes manual effort.
Author: LeetQuiz Editorial Team
Ultimate access to all questions.
In a CI/CD workflow using AWS CodePipeline and CodeCommit, how can a developer resolve merge conflicts in their feature branch with minimal effort after failing to pull recent changes from the main branch?
A
Clone the repository, then create and update a new branch.
B
Create a new branch from the previous one.
C
Utilize the Commit Visualizer to compare feature commits and resolve conflicts.
D
Halt pulls from the main branch and rebase the feature branch.
No comments yet.