When I do Team -> Pull on my project
I have a Failed result, then under the merge input I have a tow modification, but none of them affect the same file, so there are no conflicts.
Why did this show fail? This is mistake?
I just made a command -> Reset.
I select Mixed (head and index) and it looks like it works.
(But I do not know if this is the best way)