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.

  • EGit, selecting correct parameters for URI, Host, and Repository Path.
  • How to add an already existing branch in an already existing Android Repository on Eclipse
  • Eclipse + Git - How to show only modified files in compare with option?
  • How do you handle different Java IDEs and svn?
  • Eclipse Git self signed certificate error
  • The requested resource () is not available. (when running Tomcat 7.0 after downloading of JSF 2.0 project)
  • Why is this showing as failed? Is this a bug?

    egit bug

  • Showing git branch in shell prompt?
  • GitHub Clone Error: Cannot clone with EOF error
  • How can I determine username from the Url of a remote repository?
  • Tell Git to ignore a file's whole contents moving down one line
  • Gerrit - annotate patch-sets
  • bad numeric config value 'tru' for 'core.longpaths': invalid unit
  • 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.