Checkout conflict with files. How do I proceed?

Question

I just pulled some changes from a remote repository holding my teams project.

This is the message I received on pull:

Apparently, one of my partners made changed to the same file as me.

How do I proceed from here? The message is very vague. Was there an error? Do I have to undo what I did? Does he have to?

Answer 1

I faced this issue today and below solution works for me.

1. Do a git stash. This will consolidate all your local and conflicting changes.
2. Do a git pull now