How does git mergetool work to resolve conflicts?

Question

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.

Possible duplicate of How to resolve merge conflicts in Git? — Mr. Alien
– Mr. Alien, Commented Jan 14, 2017 at 22:25
I understand how you resolve the conflicts in the tool itself, I'm just confused as to what happens after saving. I assume that the saved copy becomes the 'resolved' file? — user5042150
– user5042150, Commented Jan 14, 2017 at 22:26

mkrieger1 · Accepted Answer · 2017-01-15 01:56:33Z

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.

triplem · Accepted Answer · 2017-01-14 22:36:05Z

0

Git considers a merge as resolved as soon as you add the file to the staging area using git add ..

Git is not changing its internal state on a simple edit.

answered Jan 14, 2017 at 22:36

1,3341 gold badge13 silver badges29 bronze badges

1 Comment

In general this is correct, however, editing the file using git mergetool will add it to the index.