search

gwtd3 / gwt-d3

A GWT wrapper library around the d3.js library
Other
131 stars 53 forks source link

Adding support for d3 Tree Layout API and collapsible tree demo #62

Closed evshi closed 11 years ago

anthonime commented 11 years ago

Hi Evan, Sorry for my late reply, I was quite busy these days... Thank you for this contribution, you did a good work. Unfortunately, I cannot integrate your work because of those 3 files:

I think it is because of incompatible formatting preference or because of line ending issues.

So, please do the following:

  1. add the property core.autocrlf=true in your git configuration (through Eclipse git plugin or through your git system, I dont know how you "git add" to the index
  2. rebase your work on the latest remote branch of the official repo (so that your work is auto mergeable)
  3. replace your local version of the 3 files mentioned above by the remote version (no problem if you lose your work in these files, there are straightforward minor changes and I will put them back myself)
  4. Push again / do another pull request.

Then I will immediately merge your work in gwt-d3.

Thank you again

evshi commented 11 years ago

I'm fairly certain I didn't do this right. It's really messy right now because I didn't rebase regularly :(. My fault. At this point, I think it would be easier if I forked again and applied my changes since it wasn't too much. I will resubmit another pull request.

evshi commented 11 years ago

I've submitted a new pull request that should be auto-mergeable. Please review it here: https://github.com/gwtd3/gwt-d3/pull/65. Thanks!