git checkout master
git pull https://gitee.com/src-openeuler/k3s.git sync-pr23-openEuler-24.03-LTS-SP2-conflict-to-master
git push origin master