On Tue, 27 May 2025 21:59:05 GMT, Magnus Ihse Bursie <i...@openjdk.org> wrote:
> The file types .rej and .orig are often created by diff tools. Adding them to > .gitignore will help people from mistakenly committing these files. > > See https://github.com/openjdk/jdk/pull/25306#discussion_r2102407122 for an > example of where this happened. I am open for reverting this if it causes trouble in established workflows. But the problem with committed .rej files is real too, and I'm not sure how to solve that without using .gitignore. I think we need to either: A) establish that this new behavior is much worse than the risk for integrating unwanted files (if so, we can just revert this), or B) find another solution that allows us to remove this change but still catch the unwanted .rej and .orig files. I don't have any good suggestions on B, and I am not sure how we could decide if A is applicable or not. ------------- PR Comment: https://git.openjdk.org/jdk/pull/25474#issuecomment-2931581297
