Failed, DIRTY_WORKTREE in eclipse, how to solve it?

Question

I am currently working on a java project and when committing my changes and pulling I get the following error. I don't know how to resolve it:

Dirty worktree, eclipse

I tried everything, but can't seem to fix the problem, can someone please help me?

To be clear, I am using eclipse.

Would http://stackoverflow.com/a/15476133/6309 help? – VonC May 07 '14 at 08:27 — VonC, May 07 '14 at 08:27

score 59 · Accepted Answer · answered Mar 18 '15 at 09:08

59

Delete the affected files and try to pull again. Thereafter push your changes to the git.

answered Mar 18 '15 at 09:08

kds

28,155
9
38
55

Mohannad · Answer 2 · 2019-11-06T11:06:43.323

10

below steps may help

delete non-versioned files git clean -df
reset your local changes

git fetch git reset --hard

edited Nov 06 '19 at 11:06

answered Oct 06 '16 at 06:20

Mohannad

111
1
4

score 6 · Answer 3 · answered Jun 01 '15 at 20:56

6

I got the same error while trying to merge the code. Delete the respective file in either of the branches to merge DIRTY_WORKTREE FAILED

answered Jun 01 '15 at 20:56

Vamsi Ravi

1,196
8
26

score 1 · Answer 4 · answered Feb 16 '17 at 17:25

Assuming your working in a local branch, that is branched from a remote branch, and the merge conflict is occurring after you 'commit and push' upstream, merge to remote branch.

Try these 3 steps:

Copy off the new changes from the specific file causing the merge issue.
In Eclipse, Explorer pane, rt-click on the specific file causing the merge issue, and select replace with previous revision.
Now perform a 'commit and push'
Perform a merge to remote branch (no conflict should be observed).
In Eclipse, rt-click on the specific file again, and select 'pull' - the file should now be in sync all the way through.
Now add the new changes, save, commit and push, and merge to remote branch (not conflicts should be observed).

score 0 · Answer 5 · answered Jan 21 '19 at 01:25

0

In my case, I had uncommitted changes.

I committed my changes and then I was able to merge successfully without dirty_worktree error.

answered Jan 21 '19 at 01:25

UsamaAmjad

4,175
3
28
35

score 0 · Answer 6 · answered May 22 '19 at 14:42

0

So... another option that worked for me and my DIRTY_WORKTREE... Stash your changes and then Pull.

This solution meant that I did NOT lose some local useful logging changes from simply deleting the offending file.

answered May 22 '19 at 14:42

RBrown

193
1
1
11

score 0 · Answer 7 · edited Jun 19 '19 at 10:41

0

I had the same error as:

DIRTY_WORKTREE pom.xml

So I deleted the pom.xml from my working directory and did a pull from particular branch.

It worked for me.

edited Jun 19 '19 at 10:41

Bulat

720
7
15

answered Jun 19 '19 at 10:03

Ajinkya Karode

157
1
12

Shahan Mehbub · Answer 8 · 2019-08-22T12:53:01.510

0

I resolved this error by selecting "Assume Unchanged" for the file that I was unable to delete.
STS, In the toolbar. Show View->Git Staging->Unstaged Changes.
OR
Right-click on the file->Team->Advanced->Assume Unchanged

edited Aug 22 '19 at 12:53

answered Aug 22 '19 at 12:47

Shahan Mehbub

69
1
4

score 0 · Answer 9 · answered Jul 03 '20 at 16:44

0

The most simple and easy way is to Rebase

Right click Repo > Rebase See image
Stash your changes
Done, WOW
From the stashed changes just compare and take necessary code or you can apply stash

answered Jul 03 '20 at 16:44

Shubh

1
2

Failed, DIRTY_WORKTREE in eclipse, how to solve it?

9 Answers9