You ran git merge feat while on main. Which line is main's version?
<<<<<<< HEAD timeout = 30 ======= timeout = 60 >>>>>>> feat
- Neither line
timeout = 60- Both lines
timeout = 30
The block between
Play Git ▸
<<<<<<< HEAD and ======= is the current branch (HEAD, here main). The part after ======= comes from feat.