How do I mark conflicts as resolved in the git GUI tool?

Question

I'm trying to merge changes from a feature branch into the development branch of my project. I use both the GitHub GUI app for Mac OS X as well as the command line to manage my git projects. For a long time, I've been able to manage merge conflicts with the command line, but I have no idea if and how to do the same thing in the GUI client. Even if I resolve the conflicts in BBEdit and then click the "Commit" button, it still says:

•error: 'commit' is not possible because you have unmerged files.
hint: Fix them up in the work tree,
hint: and then use 'git add/rm <file>' as
hint: appropriate to mark resolution and make a commit,
hint: or use 'git commit -a'.
fatal: Exiting because of an unresolved conflict.
 (128)

How can I resolve this without resorting to the command line?

Answer 1

I had this same issue. I modified the conflict file in Dreamweaver but the conflict still appears in the GUI. The only way to resolve was doing a git add from the command line. In this case I opened the file directly from Dreamweaver. Next, I recreated the conflict situation but this time opened the file in Dreamweaver from the Git GUI and resolved the conflict. The GUI recognized the resolution and allowed me to commit WITHOUT using git add from the command line.

The short answer, use the Git GUI to open the file.

Answer 2

May not be answer you were looking for but, I had same problem and I did git add . and git commit -m "commit message here" and then git push from git bash CLI instead from code IDE CLI and it worked.

Answer 3

if use “git mergetool” to start the beyond compare 3 ,when resolve the conflict and close the beyond compare 3, the file with conflict has been marked resolved and can be commit. but,if use "git gui" to start the beyond compare 3,when resolve the conflict and close the beyond compare 3,the git gui also remind "conflict".Then ,you should click the file in the left column to mark the resolution.