kwebsite-rebase

kwebsite-rebase.sh

# `origin` is this repository, 'github' is the remote fork
# and '1.18-kubeadm-upgrade' is the remote branch
git checkout 1.18-kubeadm-upgrade
# create a patch between current PR branch and dev-1.18
# results in '0001-kubeadm-update-upgrade-documentation-for-1.18.patch'
git format-patch dev-1.18 
git checkout master
# delete old branches
# at this point dev-1.18 was rebased remoteley and just pulling it locally
# would cause conflicts.
git branch -D dev-1.18
git branch -D 1.18-kubeadm-upgrade
# fetch a new dev-1.18
git fetch origin dev-1.18:dev-1.18
git checkout dev-1.18
git checkout -b 1.18-kubeadm-upgrade
# apply the patch
git am -3 0001-kubeadm-update-upgrade-documentation-for-1.18.patch
# 'git am' would fail, fix conflicts here
git add -u
git am --continue
# force push the local branch to the remote
git push -f github 1.18-kubeadm-upgrade