That sounds like your Git client is normalizing line endings in this file. Does "git diff" show any non-whitespace differences? This can happen when different clients from different platforms (Win, Mac, Linux) have inconsistent autocrlf settings.
The only solution I know of is to check the file in with the correct line endings. But, somebody more experienced with git than I can perhaps provide a more convenient solution? Christian Sent from my iPhone On 2013-01-18, at 18:35, Benjamin Cabé <[email protected]> wrote: > > Le 18 janv. 2013 à 22:54, Ed Willink <[email protected]> a écrit : > >> Hi >> >> This is standard GIT protection for edited files. > > Sure, but neither git checkout -- soa-bpel.b3aggrecon, git stash, git reset > --hard, or even git clean -d -f seem to restore the file back in its HEAD > state… > > Benjamin > _______________________________________________ > cross-project-issues-dev mailing list > [email protected] > https://dev.eclipse.org/mailman/listinfo/cross-project-issues-dev _______________________________________________ cross-project-issues-dev mailing list [email protected] https://dev.eclipse.org/mailman/listinfo/cross-project-issues-dev
