Which pair of changes is likely to need manual text resolution during a merge?

• Both branches replace one line with exactly the same new text.
• Each branch edits a separate file without renaming or deleting it.
• Both branches replace one line with incompatible new text.

Q has parent P. R and S each have parent Q. The branch tips are R and S. Which commit is their merge base?

• Q
• P
• R
• S

Git replays commit X onto Y to create X'. X' has a different parent from X, so X' has a new commit ID.

Main changes an error message. Feature adds a check for missing input. Both changes are required. During conflict resolution, what result should you aim for?

• Keep the changed message while discarding the missing-input check.
• Keep the changed message and input check, then test both.
• Keep only the missing-input check.

A merge paused with a conflict in settings.py. You edited it, removed the markers and passed the relevant tests. What completes this ordinary merge?

• Run git add settings.py, then git commit.
• Run git commit without git add.
• Create another branch without staging or committing the file.

Main and feature have diverged. An ordinary merge finishes by creating a merge commit. Which ancestry does that new commit record?

• One parent at the merge base, with both branch tips removed.
• Two parents at the original main and feature tips.
• One parent at a replayed feature tip, replacing both original tips.

If Git reports no text conflicts during a merge, the combined program is guaranteed to meet its behavior requirements.

Your private branch needs an updated base for review; nobody uses its commits. Another branch has commits teammates use. Which plan avoids rewriting their history?

• Rebase both branches without coordination.
• Merge your private branch but rebase the branch that teammates already use.
• Rebase your private branch and merge the branch that teammates use.