Here are some tips for git workflow.
# The first two steps can be skipped after you do it once. git remote add upstream [url to tvm repo] git fetch upstream git rebase upstream/master
conflicted.py
.git add conflicted.py
git rebase --continue
git push --force
Sometimes we want to combine multiple commits, especially when later commits are only fixes to previous ones, to create a PR with set of meaningful commits. You can do it by following steps.
git config core.editor the-editor-you-like
git rebase -i HEAD~3
pick
, and change later ones to squash
.git push --force
You can always use git reset to reset your version to the most recent master. Note that all your local changes will get lost. So only do it when you do not have local changes or when your pull request just get merged.
git reset --hard [hash tag of master] git push --force
The previous two tips requires force push, this is because we altered the path of the commits. It is fine to force push to your own fork, as long as the commits changed are only yours.