Exit DVA-C02 AWS Developer Associate
Question 2 of 5
0% complete
Q2 Single choice

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?

  • A

    Clone the repository. Create a new branch. Update the branch with the changes.

  • B

    Create a new branch. Apply the changes from the previous branch.

  • C

    Use the Commit Visualizer view to compare the commits when a feature was added. Fix the merge conflicts.

  • D

    Stop the pull from the main branch to the feature branch. Rebase the feature branch from the main branch.

Previous Next