On Thu, 16 Apr 2026 14:59:55 GMT, Ivan Bereziuk <[email protected]> wrote:
> Keeping `.rej` and `.orig` files visible to the developer is important. It > helps minimizing human error when moving or applying source code changes. > > > --------- > - [x] I confirm that I make this contribution in accordance with the [OpenJDK > Interim AI Policy](https://openjdk.org/legal/ai). Looks good to me. I agree that seeing `.rej` and `.orig` files is important, especially in update releases. If a patch doesn't apply cleanly, the `.rej` files provide crucial information about the conflicts. These file types were added to `.gitignore` in #25474 ([JDK-8357920](https://bugs.openjdk.org/browse/JDK-8357920)) to prevent them from being committed into the repo. Yet I think seeing both `.rej` and `.orig` in the output of `git status` outweighs rare occasions when these files could accidentally be committed. [SKARA-2514](https://bugs.openjdk.org/browse/SKARA-2514) will ensure `.rej` and `.orig` can't be committed. ------------- Marked as reviewed by aivanov (Reviewer). PR Review: https://git.openjdk.org/jdk/pull/30772#pullrequestreview-4122329290
