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

Back to Main

Let's fix our hastiness by doing a hard reset of the merge commit, this will allow us to take a different approach to resolving the conflict.

Luckily, we haven't borked main yet, we just need to fix our add_customers branch.

Assignment

Try merging main into add_customers again.
This time, resolve the conflict by keeping only the changes from main and discarding your changes. We don't want to throw out all the changes from add_customers, just the line that conflicts with main. Remember, add_customers also contains the new orgs/partners.txt file that we want to keep.
After resolving conflicts, add and commit again with a message starting with E:
- For example: E: fine, Greg can have this one.

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