docs/release/expanded/update_kdm.md
After the RCs are cut you need to generate the KDM PR within a few hours
go generateok, so you have all the commits and you are ready to go, suddenly someone asks you to squash all the changes to the channels.yaml and the data/data.json together. The goal is to have 2 commits, one with all the changes to channels.yaml, and one with the changes to data/data.json. They might also ask you to rebase from the upstream branch...
git pull --rebase upstream <branch to rebase from> for example: git pull --rebase upstream dev-v2.7
git push -f origin <branch name>, for example: git push -f origin k3s-release-septembergit reset --hard HEAD~<commit number>, for example if you had 20 commits: git reset --hard HEAD~20
git merge --squash HEAD@{1}
HEAD@{1} is returning to where HEAD was before resetgit restore --staged data/data.json
git add data/data.json
go generategit push -f origin <branch> for example: git push -f origin k3s-release-septemberIf a PR already exists, add the new commits to the PR rather than generating a new one.
In some cases you may need to generate two PRs, ask the QA lead. For example, currently (28 Sep 2022) we generate a PR against branch dev-v2.6 and branch dev-v2.7.