Quiz: git for configuration

Question 10 of 10

One correct answer

After git stash pop, lab-site.conf contains “<<<<<<< Updated upstream” … “=======” … “>>>>>>> Stashed changes”. How do you finish?

Build the line I need, delete the markers, then sudo git add lab-site.conf and sudo git stash drop.
Reload nginx — it skips the markers as comments.
Run sudo git stash pop again — the second time git merges without a conflict.
Run sudo git add lab-site.conf right away — git removes the markers itself.

Back A–D or ↵ Sign in to answer