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

Resolve the Conflict

The same git checkout --theirs and git checkout --ours commands we used with merge can be used to resolve conflicts during a rebase.

You also may have noticed that if you open the file in your editor (depending on your editor) it has UI features to help you resolve the conflict. For example, in VS Code you will see something like this:

"Accept incoming change" is the same as git checkout --theirs, and "Accept current change" is the same as git checkout --ours.

In a merge, --ours refers to your current branch, but in a rebase, --ours refers to the branch you're rebasing onto.

Assignment

Use the appropriate git checkout command to overwrite the banned branch's changes with the changes from main.
Once you've edited the file, add, but do not commit the changes
- With rebase conflicts, unlike merge conflicts, we don't commit to resolve the conflict. Instead, we --continue the rebase.
Run git rebase --continue to continue the rebase.
Run git log to see the new commit history. Notice that the I commit (the one with the changes we discarded) is gone... we'll talk about that in a bit.

Run and submit the CLI tests while still on the banned branch.