puppetlabs / support-tasks

Module for tasks in the support kb
3 stars 23 forks source link

Sup-4590 - Deprecation of set_cache_paths_to_default task [st0236] #169

Closed Aaronoftheages closed 11 months ago

Aaronoftheages commented 11 months ago

SUp-4590 - Deprecation of st0236_set_cache_paths_to_default

Add deprecation notice to both task/st0236_set_cache_paths_to_default.rb and st0236_clean_cert.json

image

m0dular commented 11 months ago

@Aaronoftheages There should never be a need to merge main, or whatever upstream branch you base your feature branch on, back into the feature branch. You can set this to avoid it in the future, and it's a good idea 99% of the time anyway.

git config --global pull.rebase true

To fix this branch you can do this, assuming upstream is what the puppetlabs remote is named for you.

git checkout SUP-4590_Deprecate_ST0236_set_cache_paths_to_default
git pull --rebase upstream main -X theirs
git push -f

Other than that, we just need a link to the puppet_conf task as an alternative in the README.