[Rev 02] RFR: 8236912: NullPointerException when clicking in WebView with Button 4 or Button 5

Kevin Rushforth kcr at openjdk.java.net
Tue Jan 14 15:08:47 UTC 2020


On Tue, 14 Jan 2020 14:55:31 GMT, Robert Lichtenberger <rlichten at openjdk.org> wrote:

>> Oh, I see the problem. In addition to rebasing you need to exclude any commits that are from the `master` branch and are not your. So what you really need to do is:
>> 
>> git rebase -i upstream/jfx14
>> <EDIT THE LIST OF COMMITS AND DROP ANY THAT ARE NOT YOURS>
>> git push --force origin JDK-8236912
>> 
>> Sorry for not anticipating this problem.
> 
>> Sorry for not anticipating this problem.
> I am sorry for not knowing git well enough. Thank you for your patience and help ;-). I think the PR now contains what it should ;-).

Yes, it looks fine now, so it is ready for review. And this is one thing that can be a bit tricky about using git with multiple branches.

Btw, I was going to suggest `git rebase -i` the first time (it's what I always do in such a situation), but thought I could save you a step. Lesson learned. :)

-------------

PR: https://git.openjdk.java.net/jfx/pull/85


More information about the openjfx-dev mailing list