On Thu, 16 Apr 2020 20:45:17 GMT, John Neffenger <github.com+1413266+jgn...@openjdk.org> wrote:
> Let me know if you would like me to rebase my changes and force push a > cleaner update. Yes, this is what you will need to do. More than just being needed for a cleaner update, the PR lists 6,151 changed files! Either the merge went badly or it has somehow managed to confuse GitHub (my money is on the latter based on what I see in the diffs). Either way, rebasing and force-pushing your branch is the way to go. You might need to export your patch and reset your branch to master if git has trouble rebasing. ------------- PR: https://git.openjdk.java.net/jfx/pull/60
