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

Rebase Conflicts

Full disclosure: a lot of rebase's bad rep comes from conflicts! Fear not. It's nothing you can't handle with just a smidge of practice.

Rebasing feels scarier because it rewrites Git history, which means if you're not careful, you can lose work in an unrecoverable way. But as long as you understand what's going on, it will make your (and your team's) Git history cleaner and easier to understand.

Assignment

Switch to a new branch called banned (a new copy of the main branch).
Add a new file: customers/banned.csv with the following content:

first_name,last_name,company,title
Kayha,tbd,TheMarchOfTime,sidekick
sam,ctrlman,closedai,ceo

Commit that with a message starting with I:.
Switch back to main and add the same file, but with these contents:

first_name,last_name,company,title
Ballan,Agrandian,Boots.lore,Protagonist
sam,ctrlman,closedai,ceo

Commit that with a message starting with J:.

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