Skip to content

Eclipse hangs when pulling/rebasing

Created originally on Bitbucket by peterkronenberg (Peter Kronenberg)

Unfortunately, we don't have any sort of stack trace for this issue. Trying to describe it as best as we can

  • Make some modifications to a few files.
  • Open synchronize view/perspective. Files were displayed under uncommitted. Committed the changes with a test message
  • Team -> Pull with rebase option or Synchronize View -> Pull was not showing the changes that other developers have pushed.
  • Tried for a couple of times after which saw at least one developer’s change
  • Pulled the changes
  • Tried to push our changes, received error “push creates new remote head…”
  • Did a Team -> Pull again and it reported some conflicts with a file which had no local changes
  • Compare editor did not show any differences
  • Marked the file as resolved.
  • Again did Team -> Pull, 2 dialogs displayed with something related to conflict but no interactive operations (like Ok) could be done on these dialogs, essentially Eclipse was hung
  • Killed Eclipse, re-started eclipse, Refreshed workspace, auto rebuild occurred.
  • Project had [Rebasing…] at the end even though nothing was happening
  • Clicked on Team -> Rebase and chose Continue option
  • Rebase worked
  • Synchronize - a few incoming changes were displayed in the incoming , pulled the changes
  • Tried the push again – but same error with “push creates new remote head…”

Bottom line is that we could not push our changes. Kept getting a conflict and errors trying to do the rebase.

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information