Merge conda-forge changes

[jakirkham]

Thanks Dante! 🙏

Is it possible to include the commit history from the conda-forge feedstock?

For example: https://github.com/rapidsai/xgboost-feedstock/pull/36

Think this should be possible if we do something like

git clone https://github.com/rapidsai/xgboost-feedstock
git remote add upstream https://github.com/conda-forge/xgboost-feedstock
git checkout -b merge_upstream origin/main
git merge upstream/main
# Resolving conflicts with current changes. Perhaps: git checkout 2312-merge-cf-changes -- .
git commit -m "Merge conda-forge/main into rapidsai/main"
git merge --continue
git push

[dantegd]

Sure thing, will do so now that CI is passing :)

[jakirkham]

Continued in PR: https://github.com/rapidsai/xgboost-feedstock/pull/42