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

Multi-conflict

So far, we've only dealt with one conflict at a time. That's small potatoes. Let's see what happens when we have multiple conflicts to resolve.

Assignment

Switch to a new branch off of main called delete_records.
Edit customers/all.csv and delete the jayson,gross,htmz,contributor record. It should only have the heading line.
Edit orgs/partners.txt and delete the "Boot.dev" record. It should look like this (note the blank line):

partner list

TheStartup

Commit your changes with a message starting with F:.
Switch back to main. Edit customers/all.csv but this time just change the jayson,gross,htmz,contributor record to:

carson,gross,htmx,creator

Edit orgs/partners.txt and change the "Boot.dev" record to "SalesInc" (a major competitor of MegaCorp that we pretend to be friendly with):

partner list
SalesInc
TheStartup

Commit your changes with a message starting with G:. Your history should look like this:

                  F   delete_records
                 /
A - B - C - D - E - G   main

Run and submit the CLI tests from the root of your repo while still on the main branch.