{"action":"created","issue":{"url":"https://api.github.com/repos/tthuem/FeatureIDE/issues/231","labels_url":"https://api.github.com/repos/tthuem/FeatureIDE/issues/231/labels{/name}","comments_url":"https://api.github.com/repos/tthuem/FeatureIDE/issues/231/comments","events_url":"https://api.github.com/repos/tthuem/FeatureIDE/issues/231/events","html_url":"https://github.com/tthuem/FeatureIDE/issues/231","id":63643414,"number":231,"title":"Line Endings after 'git pull' not correctly recognized","user":{"login":"ckruczek","id":1372724,"avatar_url":"https://avatars.githubusercontent.com/u/1372724?v=3","gravatar_id":"","url":"https://api.github.com/users/ckruczek","html_url":"https://github.com/ckruczek","followers_url":"https://api.github.com/users/ckruczek/followers","following_url":"https://api.github.com/users/ckruczek/following{/other_user}","gists_url":"https://api.github.com/users/ckruczek/gists{/gist_id}","starred_url":"https://api.github.com/users/ckruczek/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ckruczek/subscriptions","organizations_url":"https://api.github.com/users/ckruczek/orgs","repos_url":"https://api.github.com/users/ckruczek/repos","events_url":"https://api.github.com/users/ckruczek/events{/privacy}","received_events_url":"https://api.github.com/users/ckruczek/received_events","type":"User","site_admin":false},"labels":[{"url":"https://api.github.com/repos/tthuem/FeatureIDE/labels/enhancement","name":"enhancement","color":"207de5"}],"state":"closed","locked":false,"assignee":{"login":"ckruczek","id":1372724,"avatar_url":"https://avatars.githubusercontent.com/u/1372724?v=3","gravatar_id":"","url":"https://api.github.com/users/ckruczek","html_url":"https://github.com/ckruczek","followers_url":"https://api.github.com/users/ckruczek/followers","following_url":"https://api.github.com/users/ckruczek/following{/other_user}","gists_url":"https://api.github.com/users/ckruczek/gists{/gist_id}","starred_url":"https://api.github.com/users/ckruczek/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ckruczek/subscriptions","organizations_url":"https://api.github.com/users/ckruczek/orgs","repos_url":"https://api.github.com/users/ckruczek/repos","events_url":"https://api.github.com/users/ckruczek/events{/privacy}","received_events_url":"https://api.github.com/users/ckruczek/received_events","type":"User","site_admin":false},"milestone":null,"comments":1,"created_at":"2015-03-23T06:55:37Z","updated_at":"2015-03-23T14:44:51Z","closed_at":"2015-03-23T14:44:51Z","body":"I did some research about the line endings topic and here are my results:\r\n\r\nI cloned completly new repository, after a few hours a pulled the new changes into my repo with the following result:\r\n\r\n```bash\r\n M plugins/de.ovgu.featureide.core.featurecpp/lib/fc++v0.6Linux64bit\r\n M plugins/de.ovgu.featureide.core.featurehouse/.classpath\r\n M plugins/de.ovgu.featureide.core.featurehouse/src/de/ovgu/featureide/featurehouse/FeatureHouseComposer.java\r\n M plugins/de.ovgu.featureide.core.featurehouse/src/de/ovgu/featureide/featurehouse/model/HaskellClassBuilder.java\r\n M plugins/de.ovgu.featureide.core/src/de/ovgu/featureide/core/fstmodel/FSTClass.java\r\n M plugins/de.ovgu.featureide.core/src/de/ovgu/featureide/core/fstmodel/FSTClassFragment.java\r\n M plugins/de.ovgu.featureide.core/src/de/ovgu/featureide/core/fstmodel/FSTMethod.java\r\n M plugins/de.ovgu.featureide.core/src/de/ovgu/featureide/core/fstmodel/FSTRole.java\r\n M plugins/de.ovgu.featureide.core/src/de/ovgu/featureide/core/fstmodel/RoleElement.java\r\n M plugins/de.ovgu.featureide.core/src/de/ovgu/featureide/core/signature/java/JavaStringBuilder.java\r\n M plugins/de.ovgu.featureide.fm.ui/src/de/ovgu/featureide/fm/ui/editors/ConstraintDialog.java\r\n M plugins/de.ovgu.featureide.ui/src/de/ovgu/featureide/ui/statistics/core/composite/lazyimplementations/ClassNodeParent.java\r\n M plugins/de.ovgu.featureide.ui/src/de/ovgu/featureide/ui/statistics/core/composite/lazyimplementations/ClassSubNodeParent.java\r\n M plugins/de.ovgu.featureide.ui/src/de/ovgu/featureide/ui/statistics/core/composite/lazyimplementations/ContractCountNodeParent.java\r\n M plugins/de.ovgu.featureide.ui/src/de/ovgu/featureide/ui/statistics/core/composite/lazyimplementations/FeatureContractNodeParent.java\r\n M plugins/de.ovgu.featureide.ui/src/de/ovgu/featureide/ui/statistics/core/composite/lazyimplementations/FieldNodeParent.java\r\n M plugins/de.ovgu.featureide.ui/src/de/ovgu/featureide/ui/statistics/core/composite/lazyimplementations/FieldSubNodeParent.java\r\n M plugins/de.ovgu.featureide.ui/src/de/ovgu/featureide/ui/statistics/core/composite/lazyimplementations/InvariantNodeParent.java\r\n M plugins/de.ovgu.featureide.ui/src/de/ovgu/featureide/ui/statistics/core/composite/lazyimplementations/LOCNode.java\r\n M plugins/de.ovgu.featureide.ui/src/de/ovgu/featureide/ui/statistics/core/composite/lazyimplementations/MethodContractNodeParent.java\r\n M plugins/de.ovgu.featureide.ui/src/de/ovgu/featureide/ui/statistics/core/composite/lazyimplementations/MethodNodeParent.java\r\n M plugins/de.ovgu.featureide.ui/src/de/ovgu/featureide/ui/statistics/core/composite/lazyimplementations/MethodSubNodeParent.java\r\n M plugins/de.ovgu.featureide.ui/src/de/ovgu/featureide/ui/statistics/core/composite/lazyimplementations/StatisticsContractComplexityNew.java\r\n M plugins/de.ovgu.featureide.ui/src/de/ovgu/featureide/ui/statistics/core/composite/lazyimplementations/StatisticsProgramSizeNew.java\r\n M plugins/de.ovgu.featureide.ui/src/de/ovgu/featureide/ui/statistics/core/composite/lazyimplementations/SumImplementationArtifactsParent.java\r\n M plugins/de.ovgu.featureide.ui/src/de/ovgu/featureide/ui/statistics/core/composite/lazyimplementations/genericdatatypes/HashMapNodeTwoStrings.java\r\n M plugins/de.ovgu.featureide.ui/src/de/ovgu/featureide/ui/statistics/core/composite/lazyimplementations/genericdatatypes/HashMapNodeTwoStringsSub.java\r\n M plugins/de.ovgu.featureide.ui/src/de/ovgu/featureide/ui/views/collaboration/CollaborationView.java\r\n M plugins/de.ovgu.featureide.ui/src/de/ovgu/featureide/ui/views/collaboration/GUIDefaults.java\r\n M plugins/de.ovgu.featureide.ui/src/de/ovgu/featureide/ui/views/collaboration/action/ShowFieldsMethodsAction.java\r\n M plugins/de.ovgu.featureide.ui/src/de/ovgu/featureide/ui/views/collaboration/editparts/RoleEditPart.java\r\n M plugins/de.ovgu.featureide.ui/src/de/ovgu/featureide/ui/views/collaboration/figures/RoleFigure.java\r\n M plugins/de.ovgu.featureide.ui/src/de/ovgu/featureide/ui/views/collaboration/outline/HideAllFields.java\r\n M plugins/de.ovgu.featureide.ui/src/de/ovgu/featureide/ui/views/collaboration/outline/HideAllMethods.java\r\n M plugins/de.ovgu.featureide.ui/src/de/ovgu/featureide/ui/views/collaboration/outline/IFilter.java\r\n M plugins/de.ovgu.featureide.ui/src/de/ovgu/featureide/ui/views/collaboration/outline/SortByOccurrenceInFeature.java\r\n M tests/de.ovgu.featureide.ui-test/src/de/ovgu/featureide/ui/statistics/core/composite/lazyimplementations/StatisticProgramSizeNewTest.java\r\n```\r\n\r\nI invastigated a bit further what might cause the error and found this:\r\nhttps://bugs.eclipse.org/bugs/show_bug.cgi?id=342372#c32\r\n\r\nApparently the .gitattribute line ending configuration is still **NOT** supported in EGit\r\n\r\nI am not sure why this is EGit issue because its git's task to handle this, but it seems to affect the correct line handling.\r\n"},"comment":{"url":"https://api.github.com/repos/tthuem/FeatureIDE/issues/comments/85030711","html_url":"https://github.com/tthuem/FeatureIDE/issues/231#issuecomment-85030711","issue_url":"https://api.github.com/repos/tthuem/FeatureIDE/issues/231","id":85030711,"user":{"login":"skrieter","id":5803674,"avatar_url":"https://avatars.githubusercontent.com/u/5803674?v=3","gravatar_id":"","url":"https://api.github.com/users/skrieter","html_url":"https://github.com/skrieter","followers_url":"https://api.github.com/users/skrieter/followers","following_url":"https://api.github.com/users/skrieter/following{/other_user}","gists_url":"https://api.github.com/users/skrieter/gists{/gist_id}","starred_url":"https://api.github.com/users/skrieter/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/skrieter/subscriptions","organizations_url":"https://api.github.com/users/skrieter/orgs","repos_url":"https://api.github.com/users/skrieter/repos","events_url":"https://api.github.com/users/skrieter/events{/privacy}","received_events_url":"https://api.github.com/users/skrieter/received_events","type":"User","site_admin":false},"created_at":"2015-03-23T14:44:51Z","updated_at":"2015-03-23T14:44:51Z","body":"Fixed, changed all line endings to LF on github.\r\nSince all files you mentioned were altered in the recent SoPro, it seem that something went wrong with a merge.\r\n\r\nI fixed the line endings by re-adding the .gitattributes file via git bash.\r\nrm .git/index\r\ngit reset\r\ngit status\r\ngit add -u\r\ngit add .gitattributes\r\ngit commit -m \"...\"\r\ngit push ssh://git@github.com/tthuem/FeatureIDE master"}}