Knowledge check

1.

Which of the following statements is true about branches in Git?

Work done on a branch doesn't interfere with work in other branches.

A branch can't have any other branches that extend from its line of development.

The default branch in a Git repo is named master and this branch name can never be changed.

2.

Which of the following Git commands creates a new branch, and then changes your working location to the new branch?

git branch my-new-branch
git checkout my-new-branch

git branch -new my-new-branch
git checkout my-new-branch

git branch -new my-new-branch
git switch my-new-branch

3.

Suppose you try to merge changes from your local branch into the project repo, but Git returns a merge conflict error. What command can you use to restore the default (main) branch to its correct state?

git merge --cancel

git merge --abort

git merge --reset

4.

Which of the following samples is an accurate view of what Git might show for a merge conflict between the my-penguins branch and the main branch?

<img class="cat" src="images/panda.jpg">
<img class="cat" src="images/peacock.jpg">
<<<<<<< my-penguins
<img class="cat" src="images/penguin.jpg">
<img class="cat" src="images/platypus.jpg">
<img class="cat" src="images/pony.jpg">
>>>>>>> main
<footer>Copyright 2021 - Perfect Pets</footer>

<body>
  <img class="cat" src="images/panda.jpg">
  <img class="cat" src="images/peacock.jpg">
  <<<<<<< main
  <img class="cat" src="images/platypus.jpg">
  <img class="cat" src="images/pony.jpg">
  =======
  <img class="cat" src="images/penguin.jpg">
  >>>>>>> my-penguins
  <footer>Copyright 2021 - Perfect Pets</footer>
</body>

<head><body>
  <img class="cat" src="images/panda.jpg">
  <img class="cat" src="images/peacock.jpg">
  <<<<<<< my-penguins
  <img class="cat" src="images/penguin.jpg">
  =======
  <img class="cat" src="images/platypus.jpg">
  <img class="cat" src="images/pony.jpg">
  >>>>>>> main
  <footer>Copyright 2021 - Perfect Pets</footer>
</body></head>

Feedback