Read Git conflict markers
QuizEasy-MediumAsked in: Accenture
You are on main and run git merge feature. config.properties now contains:
<<<<<<< HEAD timeout=30 ======= timeout=60 >>>>>>> feature
Which statement is correct?
- timeout=30 is the version on main (HEAD, your current branch); timeout=60 comes from feature; you must edit the file to the right value and remove all marker lines
- timeout=30 comes from feature
- Git will choose the larger value when you commit
- The markers can stay; Java and Python ignore them
This question is part of Pro+
Pro+ opens every question in Interview Prep and the mock interview. Every article and the first 2 questions of each topic stay free. Hands-on Selenium and API tasks follow their course lesson's own lock.