When must a person step in?

• When branches touch different files
• When one branch is shorter
• When both changed the same lines differently

What is the shared base of a merge?

• The ancestor both branches grew from
• The longest file in the folder
• The newest laptop on the team

A rebase draws history into one straight line.

Circle one:   True   False

Why can the tool not decide a same-line clash?

• Its battery runs low
• It cannot know which meaning you want
• It dislikes long files

Main renamed a setting, feature rewrote its checks. What is the right resolve?

• Keep the new name with the new checks, then test
• Keep only main and drop the checks
• Keep only feature and drop the rename

What does a rebase throw away?

• All the code itself
• The true branching shape
• The programming language

Resolving well means always picking your own side.

Circle one:   True   False

Your branch is private and messy. A shared branch needs honest history. What do you do?

• Rebase both branches at once
• Merge your mess everywhere
• Rebase yours, merge the shared one