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.

challenge.txt :set list

Start

 1<<<<<<< HEAD
 2return user.name
 3=======
 4return user.full_name
 5>>>>>>> feature-branch
 6
 7<<<<<<< HEAD
 8log('loading')
 9log('retry')
10=======
11log('loading')
12>>>>>>> feature-branch
13
14<<<<<<< HEAD
15config.timeout = 30
16config.retries = 3
17config.silent = true
18=======
19config.timeout = 45
20config.silent = false
21>>>>>>> feature-branch
22
23<<<<<<< HEAD
24render('ok')
25=======
26render('success')
27render('complete')
28>>>>>>> feature-branch
29
30<<<<<<< HEAD
31next_user = user.id + 1  # HACK: blindly assumes the next user exists — cleanup scheduled Q1 2022
32=======
33alert('finished')
34>>>>>>> feature-branch

Goal

 1return user.full_name
 2log('loading')
 3config.timeout = 45
 4config.silent = false
 5render('success')
 6render('complete')
 7alert('finished')

Members only

Hold on, cowboy

You gotta sign in to take on challenges. New ones drop every week — they're fun, and insightful.