Github user chiwanpark commented on the pull request:
https://github.com/apache/flink/pull/1220#issuecomment-174369547
Hi @danielblazevski, you don't need to open a new PR and merge master
branch. Instead, you update `master` branch and rebase your local `FLINK-1745`
branch on `master` branch. After doing rebase, you have to force push on your
github `FLINK-1745` branch.
```bash
# fetch updated master branch
git fetch upstream master
# checkout local master branch
git checkout master
# merge local master branch and upstream master branch (this should be
fast-forward merge.)
git merge upstream/master
# checkout local FLINK-1745 branch
git checkout FLINK-1745
# rebase FLINK-1745 on local master branch
git rebase master
# force push local FLINK-1745 branch to github's FLINK-1745 branch
git push origin +FLINK-1745
```
Note that there is `+` before `FLINK-1745` to force push.
About raising error, I think the user specifies all parameters before
calling `fit` method in typical case. Currently, the error will raise doing
cross operation because checking metric is in `minDist` method of `QuadTree`
class. I would like to check this metric conflict before doing operation. It is
best to add a method like `checkQuadTreeConflict` in `KNN` class and call it in
`setUseQuadTree` and `setDistanceMetric` method or call it in anyway before
doing operation.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
