$ ./guess_the_languageGit
Git · easy · #14

You ran git merge feat while on main. Which line is main's version?

<<<<<<< HEAD
timeout = 30
=======
timeout = 60
>>>>>>> feat
  1. Neither line
  2. timeout = 60
  3. Both lines
  4. timeout = 30
The block between <<<<<<< HEAD and ======= is the current branch (HEAD, here main). The part after ======= comes from feat.
Play Git ▸