Your pop
resulted in a merge conflict. In order to resolve it, you need to edit the file (which you already did) and then call git add mainwindow.cpp
to tell git, that you have resolved the conflict.
If you want to preview your changes, you can do so with git diff --cached
. This is because git add
already added your changes to the index.