Le 21.06.2013 15:41, Yann Droneaud a écrit :


In thoses two latter cases, running "git add" does not fail with a
fatal error: it does nothing.
I need to run "touch test" to make "git add" fail with error "fatal:
CRLF would be replaced by LF in test.


While searching on the Internet, I've found other people complaining of a similar error

http://stackoverflow.com/questions/5074136/git-rebase-fails-your-local-changes-to-the-following-files-would-be-overwritte

The workaround, "git config --global core.trustctime false", might suggest there's a race somewhere while rebasing.

BTW, I forgot to describe my environnment:

- GNU/Linux
- Fedora 18 x86_64
- git version 1.8.1.4
- git version 1.8.3.1.448.gfb7dfaa


I believe "git rebase" should not fail here, but more, it must not
fail in a different fashion randomly.


Regards.

--
Yann Droneaud
OPTEYA

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to