Git - nano to edit the file or resolve the conflict from the server

Question

When conflict on server, run the nano (nano the conflict file)

e.g nano makes/brandlist.php

Once the code corrected:

1. Ctrl O to save (write out)
2. Enter to confirm
3. Ctrl X (to exit)