How to solve DIRTY_WORKTREE

Question

Navigation

#1 by (1 votes)

4

I'm trying to merge a git using eclipse, but it gives me an error:

DIRTY_WORKTREE "filename".

I have tried to revert commit and resetar , but neither option works.

java git eclipse

asked by anonymous 23.06.2015 / 14:58

1 answer

Spring Security without authentication How to pass a json containing data array to Php?

score 1 · Answer 1

Enter a shell into your repository.

Type git status to see the files modified since the last commit. Type git diff to see the differences if you want.

2 options:

Commits to "clean" the repository:

git add -A
git commit -m "Messagem das modificações"

OR

Delete the changes:

git reset HEAD --hard

Then the repository will be cleaned and the merge will be possible.

PS: To cancel a merge not yet committed:

git reset --merge