Hi, I performend a rename refactoring from StopWatches to Stopwatches which made git go bananas on case insensitive file systems.
If you get an error when you try to pull the changes, please delete the files org.eclipse.xtext/plugins/org.eclipse.xtext.util/src/org/eclipse/xtext/util/internal/StopWatches.java org.eclipse.xtext/plugins/org.eclipse.xtext.junit4/src/org/eclipse/xtext/junit4/internal/StopwatchRule.java on your disk and try again to pull. Please let me know if those steps do not work for you. Sorry for any inconvenience caused, Sebastian
signature.asc
Description: Message signed with OpenPGP using GPGMail
_______________________________________________ xtext-dev mailing list [email protected] https://dev.eclipse.org/mailman/listinfo/xtext-dev
