Git conflict - mergetool not configured

Question

I have had an issue with my project: I forgot to pull the remote branch before working. then I got a conflict with a stylesheet called application.css

Though when I pulled the remote branch to origin, all not conflicted files were updated (which was good). Only the above file was marked as conflicting.

My command line tool said I had to fix the conflict before commiting.

I then ran : git mergetool

But got an error mergetool not configured and then something called vdiff was launched.

It is a Windows command line conflict resolving tool but I am a bit lost of what I should do. I have no knowledge of the keys that I may use

Can you help me fix this ?

Answer 1

why don't you just open up it up with something like sublime text and then edit the conflicted application.css file manually?

After the conflict is solved you'll have to mark the file as resolved by executing

 git add <filename>

Finally, after solving all conflicts, a merge conflict situation needs to be concluded by a regular commit.