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

Checkout Conflict

We've manually edited files to resolve conflicts, but it turns out Git has some built-in tools to help us out.

The git checkout command can checkout the individual changes during a merge conflict using the --theirs or --ours flags.

--ours keeps the version of the file from your current branch (the one you're on before merging)
--theirs uses the version of the file from the branch you're merging into your current branch

git checkout --theirs path/to/file

Assignment

While on main merge the contents of delete_records.
Resolve the two conflicts in both files that we edited. In this merge, main is "ours" and delete_records is "theirs":
- customers/all.csv (keep "theirs")
- orgs/partners.txt (keep "ours")
When the conflicts are resolved, add and commit the changes with a message starting with H:.
Delete the delete_records branch.

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