On Mon, 18 Aug 2025 19:30:42 GMT, David Alayachew <d...@openjdk.org> wrote:
>> David Alayachew has updated the pull request with a new target base due to a >> merge or a rebase. The incremental webrev excludes the unrelated changes >> brought in by the merge/rebase. The pull request contains two additional >> commits since the last revision: >> >> - Merge branch 'openjdk:master' into patch-1 >> - Fixing incorrect centering of EditPad window. >> >> When calling the `setLocationRelativeTo()` method, a null parameter means >> that it centers the window in the screen. However, any subsequent resizing >> operations will change only the size, not the location of the window. >> Understandable, but now the window is no longer centered. So, changing the >> order of operations. > > I clicked the button to grab upstream changes, now the file changelist is all > garbled. Let me reattempt this pull request. @davidalayachew If you already created a commit in your local branch, you can reset your branch to its previous state before that commit with git reset HEAD~1 Then pull the updates from `origin`: git pull origin patch-1 Both commands above imply that your current branch is `patch-1`. Then update the copyright year again, commit the change, and push the update to your fork. > Ok, does that look better? > Hi @davidalayachew, you can continue with the PR with all "redundant" > commits. Our bot just looks at the diff at > https://github.com/openjdk/jdk/pull/26814.diff and automatically squashes it. @liach I believe the problem is that the remote and local branches diverged. Pushing from local isn't allowed because of that; pulling from remote directly would create a merge commit, which isn't that bad. ------------- PR Comment: https://git.openjdk.org/jdk/pull/26814#issuecomment-3198152910 PR Comment: https://git.openjdk.org/jdk/pull/26814#issuecomment-3198163607
