1

I am having the following two issues:

1) While I am trying to pull a version from remote git server(assembla), I get a message box as following image screenshot:

enter image description here

Now, when I click for the revert option, its again showing the same dialogue, doing nothing else. Even I have tried by reverting the local changes first and then pulling, same result.

2) When I am going to commit, I am getting some file list which aren't changed actually, even the status says "-/-", that means no added/modified/deleted state found. The screenshot is as follows:

enter image description here

They aren't committed at all though, not to mention. So, why they are showing there?

How to get rid of these two issues please? Are they really git plugin issue or I am doing something wrong? Thanks in advance.

Rana
  • 5,912
  • 12
  • 58
  • 91

1 Answers1

1

Your local modifications can come from the core.autocrl setting which would convert all your end-of-lines into Windows one on import.
See "Netbeans 7 + Git plugin on Windows Issues?", and "Android line breaks and git" for a recommendation.

Community
  • 1
  • 1
VonC
  • 1,262,500
  • 529
  • 4,410
  • 5,250
  • Thanks it helped me resolve the second issue. Any idea about the first issue? Thanks. – Rana Jul 13 '12 at 06:45
  • @Rana if you try again, with a new clone of your repo, the next pull shouldn't display your first error message, because git will not have transformed all the eols. – VonC Jul 13 '12 at 07:16