Question: After starting to merge a feature branch into your master branch, you encounter a merge conflict and decide you do not want to perform the merge. How can you stop the merge and restore to the pre-merge state?
- Use git restore -p.
- Use git merge -u.
- Use git merge --abort.
- Use git merge --undo.
Answer: The correct answer of the above question is Option C:Use git merge --abort.