Câu 139: AWS Certified Developer - Associate DVA-C02(New)

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?

1. A. Clone the repository. Create a new branch. Update the branch with the changes.
2. B. Create a new branch. Apply the changes from the previous branch.
3. C. Use the Commit Visualizer view to compare the commits when a feature was added. Fix the merge conflicts.
4. D. Stop the pull from the main branch to the feature branch. Rebase the feature branch from the main branch. — đáp án hiện tại