CONFLICT (content): Merge conflict in modules/profile/manifests/puppetserver/volatile.pp error: could not apply dd859fbbf0... [BETA HACK] Changes to profile::puppetserver::volatile hint: Resolve all conflicts manually, mark them as resolved with hint: "git add/rm <conflicted_files>", then run "git rebase --continue". hint: You can instead skip this commit: run "git rebase --skip". hint: To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply dd859fbbf0... [BETA HACK] Changes to profile::puppetserver::volatile
https://gerrit.wikimedia.org/r/c/operations/puppet/+/1137013 does not cleanly rebase on https://gerrit.wikimedia.org/r/c/operations/puppet/+/1161869
Mentioned in SAL (#wikimedia-releng) [2025-06-25T18:19:09Z] <bd808> Cherry-picked https://gerrit.wikimedia.org/r/c/operations/puppet/+/1137013/2 to deployment-puppetserver-1 (T397717)