{"push_id":604262883,"size":3,"distinct_size":1,"ref":"refs/heads/team3_story2","head":"2fc279a370a88c3da9abd5d8f4767412fc4e25da","before":"9e99833c74cdfebcf4b36bb61ec0f0857626dc42","commits":[{"sha":"b8b26313339731b2c76704b9e049757a853d9bd3","author":{"email":"26acff963eb723b785d08b1ca1d4c5593468cdff@INGINF02.cs.uni-magdeburg.de","name":"Kammler Max"},"message":"Merge remote-tracking branch 'origin/master' into team2_story3","distinct":false,"url":"https://api.github.com/repos/tthuem/FeatureIDE/commits/b8b26313339731b2c76704b9e049757a853d9bd3"},{"sha":"297082d7ac99c813a0ccc096a664d48b28e16523","author":{"email":"0e0dd14f6664ea9e58568e1fe080cc0cb0d58107@st.ovgu.de","name":"Sebastian Krieter"},"message":"Merged branches \"team1_story4\", \"team2_story3\", and \"team3_story5\" into\nmaster.\nRe-commited lost changes during previous merges.","distinct":false,"url":"https://api.github.com/repos/tthuem/FeatureIDE/commits/297082d7ac99c813a0ccc096a664d48b28e16523"},{"sha":"2fc279a370a88c3da9abd5d8f4767412fc4e25da","author":{"email":"7b243b7ffd76e7712da247022ef42681393f8631@st.ovgu.de","name":"M.Schleicher"},"message":"Merge branch 'master' into team3_story2\n\nConflicts:\n\tplugins/de.ovgu.featureide.core/src/de/ovgu/featureide/core/fstmodel/FSTClass.java\n\tplugins/de.ovgu.featureide.core/src/de/ovgu/featureide/core/fstmodel/FSTClassFragment.java\n\tplugins/de.ovgu.featureide.core/src/de/ovgu/featureide/core/fstmodel/FSTMethod.java\n\tplugins/de.ovgu.featureide.core/src/de/ovgu/featureide/core/fstmodel/FSTRole.java\n\tplugins/de.ovgu.featureide.core/src/de/ovgu/featureide/core/fstmodel/RoleElement.java\n\tplugins/de.ovgu.featureide.ui/src/de/ovgu/featureide/ui/actions/generator/BuildProductsPage.java\n\tplugins/de.ovgu.featureide.ui/src/de/ovgu/featureide/ui/statistics/core/ContentProvider.java\n\tplugins/de.ovgu.featureide.ui/src/de/ovgu/featureide/ui/statistics/core/StatisticsIds.java\n\tplugins/de.ovgu.featureide.ui/src/de/ovgu/featureide/ui/statistics/core/composite/lazyimplementations/ClassNodeParent.java\n\tplugins/de.ovgu.featureide.ui/src/de/ovgu/featureide/ui/statistics/core/composite/lazyimplementations/DirectivesNode.java\n\tplugins/de.ovgu.featureide.ui/src/de/ovgu/featureide/ui/statistics/core/composite/lazyimplementations/MethodSubNodeParent.java\n\tplugins/de.ovgu.featureide.ui/src/de/ovgu/featureide/ui/statistics/core/composite/lazyimplementations/StatisticsProgramSizeNew.java\n\tplugins/de.ovgu.featureide.ui/src/de/ovgu/featureide/ui/statistics/core/composite/lazyimplementations/SumImplementationArtifactsParent.java\n\tplugins/de.ovgu.featureide.ui/src/de/ovgu/featureide/ui/statistics/core/composite/lazyimplementations/genericdatatypes/AbstractSortModeNode.java\n\tplugins/de.ovgu.featureide.ui/src/de/ovgu/featureide/ui/statistics/ui/FeatureStatisticsView.java\n\tplugins/de.ovgu.featureide.ui/src/de/ovgu/featureide/ui/statistics/ui/helper/TreeClickListener.java","distinct":true,"url":"https://api.github.com/repos/tthuem/FeatureIDE/commits/2fc279a370a88c3da9abd5d8f4767412fc4e25da"}]}