xx uncommitted changes would be overwritten by merge，how can we get the conflict files

[Devying]

using the git2go we can achieve a fuction like git pull , but when a conflict occurred，we got the error message 2 uncommitted changes would be overwritten by merge.

Now , I want to get the conflict files，what should I do?