On Thu, 18 Aug 2022 23:19:49 GMT, Nir Lisker <nlis...@openjdk.org> wrote:
>> Fixes the mistakes in the JBS ticket and some additional minor corrections. > > Nir Lisker has refreshed the contents of this pull request, and previous > commits have been removed. The incremental views will show differences > compared to the previous content of the PR. The pull request contains 16 new > commits since the last revision: > > - Initial commit > - 8290473: update Eclipse .classpath in apps, buildSrc > > Reviewed-by: nlisker > - 8181084: JavaFX show big icons in system menu on macOS with Retina display > > Reviewed-by: jpereda, kcr > - 8291908: VirtualFlow creates unneeded empty cells > > Reviewed-by: kcr, aghaisas > - 8291087: Wrong position of focus of screen reader on Windows with screen > scale > 1 > > Reviewed-by: aghaisas, arapte > - 8218826: TableRowSkinBase: horizontal layout broken if row has padding > > Reviewed-by: aghaisas > - 8289605: Robot capture tests fail intermittently on Mac M1 > > Reviewed-by: kcr > - 8289397: Fix warnings: Possible accidental assignment in place of a > comparison. A condition expression should not be reduced to an assignment > > Reviewed-by: kcr > - 8290990: Clear .root style class from a root node that is removed from a > Scene/SubScene > > Reviewed-by: jhendrikx, aghaisas, mhanl > - 8290527: Bump macOS GitHub actions to macOS 11 > > Reviewed-by: arapte > - ... and 6 more: https://git.openjdk.org/jfx/compare/c4b2bcd4...263061e3 How did you do the rebase? It should be something like: git fetch upstream git rebase -i upstream/master <remove all commits that came from the master branch> Alternatively, you can `git reset --hard upstream/jfx19` to reset your branch, and then cherry pick all of the commits (or apply the aggregate diffs as one commit). ------------- PR: https://git.openjdk.org/jfx/pull/877