So once I notice that I have conflicts when pulling, I'll run git mergetool which I have setup to run with Meld.
However, once you hit save, does git automatically consider those conflicts resolved so you then just have to commit and push again?
I'm quite confused on git considers resolved. Sorry if this a dumb question. Still new to git from the terminal.
Yes, once you exit the mergetool, the saved file will be added to the index and counts as "resolved". You can then simply commit.
To be sure what will be included in the commit, run git diff --cached.