Practice Quiz: Branching & Merging

11. When we merge two branches, one of two algorithms is used. If the branches have diverged, which algorithm is used?

  • three-way merge
  • fast-forward merge
  • merge conflict
  • orphan-creating merge

12. The following code snippet represents the result of a merge conflict. Edit the code to fix the conflict and keep the version represented by the current branch.

<<<<<<< HEAD
print("Keep me!")
=======
print("No, keep me instead!")
>>>>>>> brancho-cucamonga

  • print(“Keep me!”)

13. What command would we use to throw away a merge, and start over?

  • git checkout -b <branch>
  • git merge –abort
  • git log –graph –oneline
  • git branch -D <name>

14. How do we display a summarized view of the commit history for a repo, showing one line per commit?

  • git log –format=short
  • git branch -D <name>
  • git log –graph –oneline
  • git checkout -b <branch>

15. The following script contains the result of a merge conflict. Edit the code to fix the conflict, so that both versions are included.

def main():
<<<<<<< HEAD
print("Start of program>>>>>>>")
=======
print("End of program!")
>>>>>>> improvement-to-the-code

main()

  • def main():

    print(“Start of program>>>>>>>”)

    print(“End of program!”)


    main()
Previous

Devendra Kumar

Project Management Apprentice at Google

Leave a Reply