driver/tool.cpp

Brad Roberts via digitalmars-d-ldc digitalmars-d-ldc at puremagic.com
Tue Jul 8 14:00:30 PDT 2014


On 7/8/14, 1:53 PM, Joseph Rushton Wakeling via digitalmars-d-ldc wrote:
> On Tuesday, 8 July 2014 at 20:05:26 UTC, David Nadlinger wrote:
>> Seems like this file had mixed line endings, should be fixed in master now.
>
> Thanks!
>
> This was slightly nasty to resolve, because of course the "changed" file meant I couldn't just pull;
> I had to use
>
> git fetch
> git reset --hard origin/master
>
> to check out the patch that fixed it.
>
>> It's still rather strange behavior from Git, though.
>
> Yea, not nice.  Particularly that you seemingly can't check out the file to its original form
> (though maybe I missed an option to git checkout somewhere).
>
> Thanks again for the fix!


Wouldn't this do it?

   rm <file>
   git checkout <file>



More information about the digitalmars-d-ldc mailing list