Screen Too Small

This course material requires a larger screen to properly display the terminal and editor interfaces.

Please use a tablet, laptop, or desktop computer for the best learning experience.

You can continue browsing, but the experience will be significantly limited.

Challenge Information

Tidy Up Those Git Conflicts

You've just merged a branch and now you're staring at messy Git conflict blocks. Use macros and joins to collapse and clean them into resolved lines. Oh, and maybe delete that 3-year-old TODO while you're at it.

Starting Text

vim@sandbox: ~/start.txt
vim
<<<<<<< HEAD return user.name ======= return user.full_name >>>>>>> feature-branch <<<<<<< HEAD log('loading') log('retry') ======= log('loading') >>>>>>> feature-branch <<<<<<< HEAD config.timeout = 30 config.retries = 3 config.silent = true ======= config.timeout = 45 config.silent = false >>>>>>> feature-branch <<<<<<< HEAD render('ok') ======= render('success') render('complete') >>>>>>> feature-branch <<<<<<< HEAD next_user = user.id + 1 # HACK: blindly assumes the next user exists — cleanup scheduled Q1 2022 ======= alert('finished') >>>>>>> feature-branch

Expected Output

vim@sandbox: ~/expected.txt
vim
return user.full_name log('loading') config.timeout = 45 config.silent = false render('success') render('complete') alert('finished')

Hold on, cowboy

You gotta sign up to view challenges

New challenges appear every week. They're fun, and insightful

Sign up or sign in now!

Sign In to Start