This lesson's interactive features are locked, please to keep using them

Ours and Theirs

In a merge conflict:

"Ours" refers to the branch you are on (merging into)
"Theirs" refers to the branch being merged

# you're on the "ours" branch, the "theirs" branch is "their_branch"
git merge their_branch

Git Terminology

Last time, we manually edited the conflicting files. This time, let's use Git's built-in merge resolution tools. It makes use of the terms "ours" and "theirs" to refer to the branches being merged.

Assignment

You should currently be on the add_customers branch with this commit history:

A - B - D       main
     \   \
      C - E   add_customers

switch back to the main branch.
Merge add_customers into main
- This should result in a fast-forward merge that brings C-E into main.
Delete the add_customers branch, we don't need it anymore.

Run and submit the CLI tests.