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

Resolution

After manually editing any conflicting files (sometimes it's more than one file or more than one section of a file) you need to simply add and commit the changes. This tells Git that you've resolved the conflict and it can continue with the merge.

Git will let you commit conflict markers, so check you removed them all before you continue with a merge.

Assignment

Add and commit your changes.
Start your commit message with E:
- For example: E: resolve conflict with stupid Greg's customer.
Run git log to examine your handiwork! You should see the C and D commits come together in the E commit. Conflict resolved!

Run and submit the CLI tests from inside your repo while still on your add_customers feature branch.