Version Control XK0-006 Practice Questions (Page 7)

Questions 31–31

1. 31expert · hard

   A developer is merging the 'feature-login' branch into 'main'. Git reports a merge conflict in 'src/auth.c'. The developer examines the file and sees that the conflict markers show the 'main' branch version has a function 'validate_user()' that the 'feature-login' branch also modified. The developer decides that the 'feature-login' version is the correct one to keep. Which command sequence should the developer use to resolve this conflict and complete the merge?

   • ARun 'git merge --abort', then run 'git merge feature-login' again
   • BRun 'git checkout --theirs src/auth.c', then run 'git commit'
   • CRun 'git reset --hard HEAD', then run 'git pull origin main'
   • DEdit src/auth.c to keep the feature-login version, run 'git add src/auth.c', then run 'git commit'
   Reveal Solution Discussion Select an answer first