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

Robert Lichtenberger rlichten at openjdk.java.net
Tue Jan 14 14:12:37 UTC 2020


On Tue, 14 Jan 2020 14:00:08 GMT, Kevin Rushforth <kcr at openjdk.org> wrote:

>> I've rebased my branch like this:
>> git fetch upstream
>> git rebase upstream/jfx14
>> git pull
>> git push
>> and changed the base branch of this PR to jfx14. Hope that was the correct way to do this ;-).
> 
> Your branch still has commits from `master` after jfx14 was branched. This was the problem:
> git pull
> 
> This pulled in additional changes from master that were already in your branch and effectively undid the rebase. You need to redo it, but this time instead of pulling changes after you rebase, you should simply do:
> git push --force origin JDK-8236912

> ```
> git push --force origin JDK-8236912
> ```
I did 
git rebase upstream/jfx14
git push --force origin JDK-8236912
but that has messed up things further, didn't it?

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

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


More information about the openjfx-dev mailing list