Rebase Guide

Rebase Guide

We need to periodically rebase relax/relax against tvm/main to sync with upstream and get new features. This page gives instructions on how to do the rebase. Note that before pushing the rebase, please communicate with the community in the Relax discord channel to get consensus.

Step0: Create a backup branch say "rebase-stage1"

git checkout relax
git checkout -b rebase-stage1
git push --set-upstream origin rebase-stage1

Step1: Rebase and push to a branch say "relax-rebase1"

git checkout -b relax-rebase1

# You can skip this command if you have done it once before
git remote add upstream [email protected]:apache/tvm.git

git fetch upstream
git rebase upstream/main
# Then resolve the conflicts...

After Step1, please make sure:

1. Relax can be built successfully;
2. All tests can pass;
3. No lint errors: use command sudo docker/bash.sh tlcpack/ci-lint:v0.68 ./tests/scripts/task_lint.sh.

Step2: Use git reset and force push to update the relax branch

git checkout relax
git reset --hard relax-rebase1
git push -f

For developers who want to rebase their local changes or want to update their PR, run git rebase --onto origin/relax origin/rebase-stage1. What it does is that:

• It takes commits from begin=origin/rebase-stage1 end=your-local-head
• Rebase them onto origin/relax