1

I have a local GIT repository which is shared for a co-worker to pull from/push to it. Now he has done his first push, but I'm unable to update my Eclipse project with his changes. In fact his changes appear like deletions to me, that is, Synchronize shows as me having deleted his recently pushed files:

enter image description here

Overwrite throws an error:

An internal error occurred during: "Overwriting 3 resources.".
Attempted to beginRule: F/Core/src/com/blablabla/android/core, does not match outer scope rule: F/Core/src/com/blablabla/android/core/db

Merge says there are no changes to merge.

Improve this question
1
  • Comments on the downvoting are welcome :)
    – m0skit0
    Commented Jul 9, 2013 at 12:49

1 Answer 1

Reset to default
4

I think this is due to this bug (I'm using Ubuntu 12.04 LTS btw, so the bug applies for Linux as well as WXP)

To solve this, I just had to create the missing directories (in my example, the core/db package -directory- was not created) and then Overwrite will work correctly.

Improve this answer

Not the answer you're looking for? Browse other questions tagged or ask your own question.