Adding file reading example and fixing commits history

windelbouwman / ppci

A compiler for ARM, X86, MSP430, xtensa and more implemented in pure Python

https://ppci.readthedocs.io/en/latest/

BSD 2-Clause "Simplified" License

337 stars 36 forks source link

Adding file reading example and fixing commits history #116

Closed darleybarreto closed 3 years ago

darleybarreto commented 4 years ago

I hope this solves the mess I've made. I'm sorry for that.

windelbouwman commented 4 years ago

No worries, we will get this right ;).

If you check the tab with files changed, you'll notice 59 files, I would not expect this, since it also includes changes I made earlier today. I'm not sure how you can fix this with git in an easy way. Maybe there is a way you can squash you commits in your branch into a single commit with a diff to the master branch.

darleybarreto commented 4 years ago

What I did in my fork was force changing the branch, once I was sure that every change was accounted for. Perhaps this is the (most dangerous and) easiest way of doing it. But I don't know if we should do it that way, that is, reset the master to aeda64d and merge. You could also remove all my commits and I could patch them into a single squashed one in another PR.