search

stevenvar / OMicroB

An OCaml generic virtual machine for microcontrollers
Other
142 stars 23 forks source link

PIC32 support #23

Closed Adilla closed 4 years ago

Vertmo commented 4 years ago

I think you should rebase this branch to target master instead of generic, now that generic has been merged

stevenvar commented 4 years ago

"This branch cannot be rebased due to conflicts Rebasing the commits of this branch on top of the base branch cannot be performed automatically due to conflicts encountered while reapplying the individual commits from the head branch."

Does someone else have admin permissions?

Vertmo commented 4 years ago

"This branch cannot be rebased due to conflicts Rebasing the commits of this branch on top of the base branch cannot be performed automatically due to conflicts encountered while reapplying the individual commits from the head branch."

Does someone else have admin permissions?

Have you tried rebasing it inside GitHub ? I think in this case it probably needs to be done in-terminal, although that's a tedious and error-prone process unfortunately... EDIT: Actually I think since there are a lot of commit hanging in there (mainly some from the old generic version of the PSTL), a good idea would be to merge-squash the whole lot on master. I've just tried it locally and it gives a reasonable result

Vertmo commented 4 years ago

I think we can close this as this is replaced by #26