main into relax instead of doing rebase #371Description
There are several issues with doing rebases:
- Rebase rewrites all commits in the rebased branch.
- Rebases cannot be done incrementally (they actually grow with time).
We're planning to integrate Relax into our ongoing development, which would entail frequently including new "relax" commits (without waiting for the "official" relax-TVM synchronization. If the "relax" branch continues to be rebased on top of "main", the point (1) above would make it somewhat painful for us to stay up-to-date with it.
We have a similar situation with our downstream development branch and the upstream "main". What we do is that we merge (git merge) the upstream "main" branch into our downstream branch on an essentially daily basis. The benefits of doing that are:
- All commit SHAs are preserved:
git pullworks before and after a merge. - Merges can be done incrementally (if there is only 1 new commit in "main", the merge will bring only 1 new commit). Likelihood of conflicts decreases significantly.
W 50CD e'd like to propose that similar process is done for synchronizing the "relax" branch with the "main" branch. Downstream consumers (like us) could merge both "main" and "relax" into their development branches, and these merges would coexist seamlessly.