crlf issues on pkg/compiler/lib/src/elements/common.dart - can't rebase after gclient sync

[Patrice Chalin]

There seems to be some work being done on crlf auto/non-conversion of SDK files. Now after sync'ing I can't manually rebase because of unstaged changes:

HEAD detached at HEAD

Changes not staged for commit:

  (use "git add <file>..." to update what will be committed)

  (use "git checkout -- <file>..." to discard changes in working directory)

modified:   pkg/compiler/lib/src/elements/common.dart

Discarding the change doesn't help since it reappears. The file in question is in DOS format (crlf) and I'm working in MacOS X. I have tried the solutions on SO but they haven't worked for me. I suspect that some of you might be in this position too and you might have a solution. If so, please share :).

Thanks,

Patrice 

[Bob Nystrom]

Stephan recently made some .gitattributes change related to this, so hopefully he can sort you out.

Cheers!

- bob

--
You received this message because you are subscribed to the Google Groups "Dart Core Development" group.
To unsubscribe from this group and stop receiving emails from it, send an email to core-dev+u...@dartlang.org.

[Peter Ahé]

See https://github.com/dart-lang/sdk/issues/23726

To unsubscribe from this group and stop receiving emails from it, send an email to compiler-dev...@dartlang.org.

[Peter Ahé]

See https://github.com/dart-lang/sdk/issues/23726

On Fri, Jun 26, 2015 at 6:30 PM 'Bob Nystrom' via Dart Compiler Developers <compil...@dartlang.org> wrote:

To unsubscribe from this group and stop receiving emails from it, send an email to compiler-dev...@dartlang.org.

[Patrice Chalin]

That did the trick, thanks!

--

Patrice