Previous

Next

Knowledge check

Completed

Choose the best response for each question, then select Check your answers.

Check your knowledge

1.

Which of the following statements about merges is false?

Files added on the compare branch can be merged into the base branch if they don't yet exist there.

Edits to lines of code on the compare branch can be merged if those same lines aren't changed on the base branch since the compare branch was last pulled.

When a merge completes successfully, it ensures that your changes didn't break the build.

2.

Why are merge conflicts bad?

The base branch becomes unstable until the conflicts are resolved. As a result, associated builds probably can't succeed.

This question is a trick. Merge conflicts aren't bad; they're an inevitable part of distributed version control.

Merge conflicts are embarrassing for the offending developer because everyone thinks they were careless.

3.

What is the best way to avoid most complex merge conflicts?

Regularly pull updates your branch.

Only pull updates for the base branch onto your branch immediately before creating a pull request.

Open a pull request as soon as you create your branch. This transparency helps everyone else understand your proposed changes so they don't merge any competing code before you do.

You must answer all questions before checking your work.

Continue