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

Edit the File

Resolving conflicts is a manual process. When they happen, Git marks the conflicted files and asks you to resolve the conflict by editing the files in your editor.

Assignment

Open the customers/all.csv file in your editor

You should see a nasty bit of text that looks like this:

first_name,last_name,company,title
<<<<<<< HEAD
karson,yummy,intercooler,ceo
=======
jayson,gross,htmz,contributor
>>>>>>> main

Your editor might even highlight the conflict markers to make it easier to see, but at the end of the day, it's just text. The top section, between the <<<<<<< HEAD and ======= lines, is our branch's version of the file. The bottom section, between the ======= and >>>>>>> main lines, is the version of the file that's on the main branch ("theirs" or as I say "Stupid Greg's").

In many cases, you might want to keep one change and discard the other. That's common when you're dealing with code changes. In this case, we're dealing with content, so we want to keep both changes.

Delete the conflict markers and leave both your change and Greg's change in the file.

The file should look like this:

first_name,last_name,company,title
karson,yummy,intercooler,ceo
jayson,gross,htmz,contributor

Save the file.

Run and submit the CLI tests from the root of the repo.