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.

  • Recover overwritten file with eclipse git
  • Can I setup Eclipse to show code changes
  • Eclipse, Git and Bitbucket - Can't push - Error 401 Unauthorized
  • Create Eclipse Project from Android Git
  • Problems keeping Git history after migrating from Eclipse to Android Studio
  • svn for eclipse on mac os lion
  • Why is this showing as failed? Is this a bug?

    egit bug

  • How do I get git to stop “lying” to me about being up-to-date with a remote branch?
  • Can you run jekyll on your own server?
  • Is there a way to get Tag objects instead of Reference ones when listing tags from a repository?
  • Build project periodically only if changes are found in the repository
  • Can I sign a git tag after it was created?
  • Why can't I push to this bare repository?
  • 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)

    Git Baby is a git and github fan, let's start git clone.