Home

[Propose] how to maintain and use the repo

The repo is forked and needs to be rebased regularly, so we must use riscv rather than the main branch

For developers

git checkout -b riscv fix-1
# fix
git commit
git push

fix PR conflict

Because we use Syncbots to rebase code based on pytorch:main(force push), so if you open PR before syncing, may you will have conflict when you rebase riscv, like:

$ git remote -v
origin  git@github.com:OERV-RVCI/pytorch.git (fetch)
origin  git@github.com:OERV-RVCI/pytorch.git (push)
rv-upstream     git@github.com:RuyiAI-Stack/pytorch.git (fetch)
rv-upstream     git@github.com:RuyiAI-Stack/pytorch.git (push)

git rebase rv-upstream/riscv

I suggest you use the method to fix conflict below:

$ git status 
interactive rebase in progress; onto 3a5cb48e42e
Last command done (1 command done):
   pick 2023b4cf27f Add RISC-V Blocklist (#1)
Next commands to do (3 remaining commands):
   pick c50dab1af89 Fix test_float_to_int_conversion_nonfinite for RISC-V
   pick 8494bb1203a Skip test if no qengine
  (use "git rebase --edit-todo" to view and edit)
You are currently rebasing branch 'test-core-test' on '3a5cb48e42e'.
  (fix conflicts and then run "git rebase --continue")
  (use "git rebase --skip" to skip this patch)
  (use "git rebase --abort" to check out the original branch)

Unmerged paths:
  (use "git restore --staged <file>..." to unstage)
  (use "git add <file>..." to mark resolution)
        both modified:   test/run_test.py
        both modified:   test/test_linalg.py

no changes added to commit (use "git add" and/or "git commit -a")

$ git rebase --abort 

$ git branch -a
  main
* test-core-test # PR branch

$ git checkout rv-upstream/riscv -b test-core-test-wip
$ git cherry-pick  bf2bf7c0a0c5cca8 # from test-core-test branch, that is your PR branch

$ git branch -f test-core-test test-core-test-wip # ensure you have all commit from the PR branch
$ git checkout test-core-test
$ git push -f origin test-core-test