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

Conflicting Changes

Working with Git is a dream when all of the developers on a project are committing changes to different lines of code. Things get a little hairy when changes to the same lines are made at the same time (e.g. one commit isn't the parent of another).

Assignment

Let's break some stuff! Remember, MegaCorp is an "enterprise" CRM service backed by the power of Git. That essentially just means that we store lists of customer data in a Git repo... truly cutting-edge stuff.

You should be on the main branch. Create and switch to a new branch called add_customers.
Add the following line to the end of customers/all.csv:

karson,yummy,intercooler,ceo

Additionally, edit the orgs/partners.txt and add these 2 lines to the end:

Boot.dev
TheStartup

Commit your changes with a commit starting with C:
- For example: C: update customers and partners.
Next, switch back to main. Your change should disappear. Add a different final line to customers/all.csv:

jayson,gross,htmz,contributor

Commit your changes with a commit starting with D:
- For example: D: add jayson to customers.

Run and submit the CLI tests while on the main branch.