You fixed the conflicted file. What next?
QuizEasy-MediumAsked in: Accenture
git merge stopped with a conflict in LoginPage.java. You have edited the file and removed the markers. What finishes the merge?
- git add LoginPage.java, then git commit (or git merge --continue)
- git push --force
- git reset --hard
- git merge --abort
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.