Eclipse: Resolve DIRTY_WORKTREE

Tag(s):

  • Right-click on your project.
  • Select Team -> Synchronize workspace.
  • You will then see conflicting files marked with a special icon.
  • Open the conflicting file and make all your changes.
  • Right-click on the file and select Mark as Merged.
  • Right-click on the your project and select Merge.
  • Right-click on the your project and select Team->Push to Upstream.