AWS Certified Developer - Associate DVA-C02 — Topic 1 Question 140

Question

A company has an application that uses AWS CodePipeline to automate its continuous integration and continuous delivery (CI/CD) workflow. The application uses AWS CodeCommit for version control. A developer who was working on one of the tasks did not pull the most recent changes from the main branch. A week later, the developer noticed merge conflicts. How can the developer resolve the merge conflicts in the developer's branch with the LEAST development effort?

Accepted Answer

Correct answer: D. The correct answer is D. Option D: Stop the pull from the main branch to the feature branch. Rebase the feature branch from the main branch. This option needs the least custom development effort.

AWS Certified Developer - Associate DVA-C02 — Question 140