EGit – pull= failled and no conflicts
When i do Team -> Pull on my project
I have result Failed, then below merge input i have tow modification but none of them is impacting the same file, so there is no conflicts.
Why is this showing as failed? Is this a bug?
One Solution collect form web for “EGit – pull= failled and no conflicts”
I just did a Team -> Reset.
I choose “Mixed” (head and index) and looks like it’s working.
(But i don’t know if it’s the best way)