dajmcdon / rtestim

https://dajmcdon.github.io/rtestim/
Other
4 stars 0 forks source link

fix `degree` and incompatible issue #26

Closed jiapivialiu closed 1 year ago

dajmcdon commented 1 year ago

No need to close the PR. Just fix the errors from the checks.

jiapivialiu commented 1 year ago

No need to close the PR. Just fix the errors from the checks.

Working on it now! Will reopen the PR once the errors get fixed.

jiapivialiu commented 1 year ago

Checks've been passed! Please continue to review @dajmcdon.

dajmcdon commented 1 year ago

Because changes were made to main, you need to rebase and try again. Please do the following:

git checkout main
git pull
git checkout ol
git rebase main

It will complain about conflicts and print some lines beginning with hint:. You should probably read those.

Then there will be a lot of conflicts to resolve. Please resolve them. Save the changes and stage the files but DO NOT commit. Instead call (as suggested in the hint):

git rebase --continue

Then you should be able to push back to this remote.

jiapivialiu commented 1 year ago

Because changes were made to main, you need to rebase and try again. Please do the following:

git checkout main
git pull
git checkout ol
git rebase main

It will complain about conflicts and print some lines beginning with hint:. You should probably read those.

Then there will be a lot of conflicts to resolve. Please resolve them. Save the changes and stage the files but DO NOT commit. Instead call (as suggested in the hint):

git rebase --continue

Then you should be able to push back to this remote.

I've solved the conflicts and merged main into ol in a previous commit. So this shouldn't be a problem.

dajmcdon commented 1 year ago

The differences displayed above ☝️ on the "Files changed" tab are wrong, because pushes were made to main after you created your PR. So you need to do what I suggested.

jiapivialiu commented 1 year ago

The differences displayed above ☝️ on the "Files changed" tab are wrong, because pushes were made to main after you created your PR. So you need to do what I suggested.

Okay, I see. Will do it soon!