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

Merge

Conflicting changes on two different branches is not a problem. The problem only arises when you try to merge those branches. When you do, Git will detect the conflict and ask you to resolve it.

Assignment

It was stupid Greg (stupid Greg) who merged his new customer data into main (commit D) while you were working on your new customer data in the add_customers branch (commit C). Because his change made it into main first (stupid Greg) it's up to you to resolve the conflict. Stupid Greg.

Now, because your manager is a luddite that "learned to code" before version control was invented, he's asked you to use merge instead of rebase.

Switch to your add_customers branch.
Merge main into it. You should get a scary message about a conflict:

Automatic merge failed; fix conflicts and then commit the result.

Run git status to confirm that you're in a conflict. You should see something like:

You have unmerged paths.
  (fix conflicts and run "git commit")

Run and submit the CLI tests while still in this filthy conflicting state.