getDOMNode() has been deprecated. Use React.findDOMNode() instead.

[vasanthk]

https://facebook.github.io/react/blog/2015/03/10/react-v0.13.html
https://facebook.github.io/react/docs/component-api.html#getdomnode

[ryanflorence]

thanks @vasanthk, mind updating this to latest master? The code isn't move around like it has been, then we'll merge this.

[vasanthk]

@ryanflorence Updated it to the latest master. Does it look fine now?

[krzysiek1507]

https://github.com/rackt/react-router/blob/master/examples/master-detail/app.js#L124-L125

[vasanthk]

@krzysiek1507 Modified it too. Thanks :)

[gaearon]

Can you squash into a single commit please?

[vasanthk]

@gaearon Getting an 'error: could not apply' when I try to squash the commits. Wonder if few of my commits have become useless after a merge. Could you help me out with the squash?

[gaearon]

@vasanthk

I usually do this:

git fetch upstream
git checkout mybranch
git merge upstream/master

# if necessary, resolve conflicts and git commit
# ...

git reset --soft upstream/master
git commit -am 'Some cool description for a single commit'
git push -f

Note that it's super important that you merge before resetting, and that the argument is the same master branch. Otherwise you risk messing up your local history.

[vasanthk]

@gaearon That worked. Thanks 👍

[gaearon]

👍