Kris Stern

Yeah, I had some issues with the file `war/src/main/webapp/scripts/hudson-behavior.js` while doing a cherry pick for https://github.com/jenkinsci/jenkins/commit/4d5fd8958cc5d7cc444d6a9f4422d7bd046b1fe0, as there were some merge conflicts. Let me see how I can best resolve...

I am not sure if this is the best way to resolve the merge conflicts... Is there any alternative suggestion? It seems like every time when I do `git cherry-pick...

> The backport of [31329fb](https://github.com/jenkinsci/jenkins/commit/31329fb47c2047ec5c249dab3e6d88b774b24bc3) is not correct. The origin commit, [4d5fd89](https://github.com/jenkinsci/jenkins/commit/4d5fd8958cc5d7cc444d6a9f4422d7bd046b1fe0), is a one-liner when the backported one is not. > > Ensure you're using the post-prettier version, given...

I suspect it could be due to the some Prettier changes as I see a similar traceback in the logs.

Thanks @NotMyFault It's probably because my local branches are behind...

Just made a PR for [JENKINS-69570](https://issues.jenkins.io/browse/JENKINS-69570) at https://github.com/jenkinsci/packaging/pull/336.

> > Postponed > > To be reconsidered for 2.361.3? > > > [JENKINS-69570](https://issues.jenkins.io/browse/JENKINS-69570) Minor 2.368 Java version check incorrect in init.d/jenkins > > I see no evidence that [jenkinsci/packaging#335](https://github.com/jenkinsci/packaging/pull/335)...

I can and will fix the JIRA issues labeling once this PR is approved.

Thanks for the comment @basil Regarding the remaining open issues: 1. Yes, I think it is better to postpone [JENKINS-69534](https://issues.jenkins.io/browse/JENKINS-69534) to be reconsidered for LTS 2.361.3. 2. Should I undo...

The reasons behind the postponement is based on the following comment made on the JIRA ticket for [JENKINS-69534](https://issues.jenkins.io/browse/JENKINS-69534) by @basil: > I am applying the lts-candidate label with the following...