I agree GitHub editing can be dangerous. I'm actually surprised you had line ending issues as most advanced text editors have things build in to deal with that. Were you using Android Studio? My next try would have been Sublime Text. Either way I think https://github.com/OneBusAway/onebusaway-android/pull/125 would have handled this.