DVA-C02 · Question #155
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 deve
The correct answer is D. Stop the pull from the main branch to the feature branch. Rebase the feature branch from the. Using the git rebase command to rebase a repository changes the history of a repository, which might cause commits to appear out of order. https://docs.aws.amazon.com/codecommit/latest/userguide/how-to-view-commit-details.html
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?
Options
- AClone the repository. Create a new branch. Update the branch with the changes.
- BCreate a new branch. Apply the changes from the previous branch.
- CUse the Commit Visualizer view to compare the commits when a feature was added. Fix the
- DStop the pull from the main branch to the feature branch. Rebase the feature branch from the
How the community answered
(17 responses)- A6% (1)
- B6% (1)
- C12% (2)
- D76% (13)
Explanation
Using the git rebase command to rebase a repository changes the history of a repository, which might cause commits to appear out of order. https://docs.aws.amazon.com/codecommit/latest/userguide/how-to-view-commit-details.html
Community Discussion
No community discussion yet for this question.