CODEWITHSUNDEEP
gitgit-mergemeldmergetool
user5042150
user5042150

Reputation:

How does git mergetool work to resolve conflicts?

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.

Upvotes: 1

Views: 539

Answers (2)

mkrieger1
mkrieger1

Reputation: 23261

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.

Upvotes: 0

triplem
triplem

Reputation: 1334

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.

Upvotes: 0

Related Questions