Skip to content

8382090: Remove .rej and .orig from .gitignore#170

Open
sendaoYan wants to merge 1 commit into
openjdk:masterfrom
openjdk-bots:backport-sendaoYan-35f623b6-master
Open

8382090: Remove .rej and .orig from .gitignore#170
sendaoYan wants to merge 1 commit into
openjdk:masterfrom
openjdk-bots:backport-sendaoYan-35f623b6-master

Conversation

@sendaoYan

@sendaoYan sendaoYan commented Apr 20, 2026

Copy link
Copy Markdown
Member

Hi all,

This pull request contains a backport of commit 35f623b6 from the openjdk/jdk repository.

The commit being backported was authored by Ivan Bereziuk on 20 Apr 2026 and was reviewed by Alexey Ivanov, Erik Joelsson, SendaoYan and Chen Liang.

Thanks!



Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Error

 ⚠️ This PR only contains changes already present in the target

Issue

  • JDK-8382090: Remove .rej and .orig from .gitignore (Bug - P4 - Approved)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk26u.git pull/170/head:pull/170
$ git checkout pull/170

Update a local copy of the PR:
$ git checkout pull/170
$ git pull https://git.openjdk.org/jdk26u.git pull/170/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 170

View PR using the GUI difftool:
$ git pr show -t 170

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk26u/pull/170.diff

@bridgekeeper

bridgekeeper Bot commented Apr 20, 2026

Copy link
Copy Markdown

👋 Welcome back syan! 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.

@openjdk

openjdk Bot commented Apr 20, 2026

Copy link
Copy Markdown

❗ This change is not yet ready to be integrated.
See the Progress checklist in the description for automated requirements.

@sendaoYan

sendaoYan commented Apr 20, 2026

Copy link
Copy Markdown
Member Author

/approval request Keeping .rej and .orig files visible, especailly if a patch doesn't apply cleanly, the .rej files provide crucial information about the conflicts. Only touch the .gitignore file, no risk,

@openjdk openjdk Bot changed the title Backport 35f623b61279a448e2ddcbb6e1ba9eebe4dee8e2 8382090: Remove .rej and .orig from .gitignore Apr 20, 2026
@openjdk

openjdk Bot commented Apr 20, 2026

Copy link
Copy Markdown

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk Bot added backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required labels Apr 20, 2026
@openjdk

openjdk Bot commented Apr 20, 2026

Copy link
Copy Markdown

@sendaoYan
8382090: The approval request has been created successfully.

@openjdk openjdk Bot added approval Requires approval; will be removed when approval is received and removed approval Requires approval; will be removed when approval is received labels Apr 20, 2026
@bridgekeeper

bridgekeeper Bot commented May 18, 2026

Copy link
Copy Markdown

@sendaoYan This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply issue a /touch or /keepalive command to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@sendaoYan

sendaoYan commented May 18, 2026

Copy link
Copy Markdown
Member Author

/approval request Keeping .rej and .orig files visible, especailly if a patch doesn't apply cleanly, the .rej files provide crucial information about the conflicts. Only touch the .gitignore file, no risk,

@openjdk

openjdk Bot commented May 18, 2026

Copy link
Copy Markdown

@sendaoYan
8382090: Approval has already been requested and approved.

@bridgekeeper bridgekeeper Bot added the oca Needs verification of OCA signatory status label May 28, 2026
@bridgekeeper

bridgekeeper Bot commented Jun 26, 2026

Copy link
Copy Markdown

@sendaoYan This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply issue a /touch or /keepalive command to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required oca Needs verification of OCA signatory status

Development

Successfully merging this pull request may close these issues.

1 participant