RFR: 8227425: Add support for e-paper displays on i.MX6 devices
kcr at openjdk.java.net
Fri Apr 17 15:16:30 UTC 2020
On Fri, 17 Apr 2020 15:05:22 GMT, Kevin Rushforth <kcr at openjdk.org> wrote:
>> @kevinrushforth Did I merge the upstream master branch correctly? The [last time I did
>> this](https://github.com/javafxports/openjdk-jfx/pull/522/commits) on the old *openjdk-jfx* repository, the pull
>> request showed only the single merge commit. This time all 87 commits from the upstream master branch are shown as part
>> of this pull request, even though the code I propose has not changed since the pull request was created on December 4,
>> 2019. Let me know if you would like me to rebase my changes and *force push* a cleaner update. While I have your
>> attention ... would you be able to be my second reviewer? This pull request is a small update that completes the large
>> project begun by [JDK-8217605](https://github.com/javafxports/openjdk-jfx/pull/369) over a year ago. Your comments on
>> that first part were very helpful, so I'm hoping you can bring that experience to this second and final part of the
>> 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.
I just checked and there is nothing wrong with your merge. But somehow it managed to confuse GitHub.
More information about the openjfx-dev