Exam 200-901 topic 1 question 484 discussion

Actual exam question from Cisco's 200-901

Question #: 484
Topic #: 1

DRAG DROP
-

Refer to the exhibit. Running the git merge example_branch command results in an error due to conflicts. The exhibit shows the output of the git log command on a branch named example_branch. Drag and drop the code from the bottom into the order to resolve the conflicts and merge example_branch into the remote master branch.

Show Suggested Answer

Suggested Answer:

by lmqnam at Nov. 26, 2023, 4:22 p.m.

Comments

Submit Cancel

herrmann69

Highly Voted 10 months, 3 weeks ago

1. git reset --hard && git checkout example_branch throw away uncommited changes (reset working tree and index) 2. git revert ac40974fe8 && git merge master revert the potential conflicting change and merge master into the current (example_branch) branch 3. Reapply the change and run "git add -A && git commit" make the change again and commit it 4. git checkout master && git merge example_branch switch to the master branch and merge example_branch into it 5. git push push the changes to the remote master branch

upvoted 13 times

...

daniii89

Most Recent 5 months ago

git reset --hard && git checkout example_branch git revert ac40974fe8 && git merge master Reapply the change and run "git add -A && git commit" git checkout master && git merge example_branch git push

upvoted 1 times

...

lmqnam

1 year, 1 month ago

git reset ... git revert ... Reapply ... git push git checkout ...

upvoted 2 times

...