| Re: [cf-dev] Strange behaviour on pull request for element-connector |
|
Thanks for the hint, Julien. You seem to be right, when I do a “git diff –b origin/master pom.xml” I see that only the actually changed lines are part of the
diff J I will need to check out why the whitespaces are tampered with in my eclipse workspace … Kai Von: cf-dev-bounces@xxxxxxxxxxx [mailto:cf-dev-bounces@xxxxxxxxxxx]
Im Auftrag von Julien Vermillard I would bet on end-of-line change (unix vs windows) or tab/space reformating try "git diff -b"
-- On Thu, Oct 16, 2014 at 8:49 AM, Hudalla Kai <Kai.Hudalla@xxxxxxxxxxxx> wrote: Guys, I have run into some strange behavior while trying to turn element-connector into an OSGi bundle. In order to do so I added the Maven Bundle Plugin to the POM file (addition of
some 10 lines). I then pushed the changes to my repo on GitHub and tried to prepare the pull request to the eclipse.element-connector repo. However, when I take a look at the pre-view of the pull request, the diff for the POM file indicates that it will be
replaced completely, i.e. not only the new lines are added but instead all existing lines will be removed and be replaced by the content of the POM from my repo. I suspect this to be somehow connected to Git not properly handling this file as a text file but
instead considering it to be a binary file. The same holds true for a change I’d like to make to the RawDataChannel.java file (remove obsolete and obviously erroneous imports) … Any ideas what the problem might be? Regards, Kai
|