WIP: Testing PR diffs (not a real PR)
This is a test PR to check how GitHub shows diffs in the face of a non-conflicting merge. The source branch is based off commit 6626e01398717dc2d9eeab4e31c2c9895398fe35, which was one commit behind master at the time this PR was created. I added a comment in a file just below some changes in that same file from the commit 05d6f544344b3520516cedf99bd4a13f96332002 , which is in master but not my source branch. I did this in such a way that it won't cause a merge conflict. I'm interesting in looking at the diffs, and in particular, the line numbers and the content around my diffs.
Progress
- [ ] Change must be properly reviewed (1 review required, with at least 1 Reviewer)
- [x] Change must not contain extraneous whitespace
- [ ] Commit message must refer to an issue
Reviewing
Using git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jfx.git pull/1998/head:pull/1998
$ git checkout pull/1998
Update a local copy of the PR:
$ git checkout pull/1998
$ git pull https://git.openjdk.org/jfx.git pull/1998/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 1998
View PR using the GUI difftool:
$ git pr show -t 1998
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jfx/pull/1998.diff
:wave: Welcome back kcr! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.
❗ This change is not yet ready to be integrated. See the Progress checklist in the description for automated requirements.