Git: Waiting for your editor to close the file

Question

I started to merge changes to a new branch on git while editing some files with emacs (the default editor) on the previous branch in another terminal.<