search

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
336 stars 36 forks source link

Adding a file reading example #121

Closed darleybarreto closed 3 years ago

codecov-io commented 3 years ago

Codecov Report

Merging #121 (e00223d) into master (9e8f679) will not change coverage. The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #121   +/-   ##
=======================================
  Coverage   78.97%   78.97%           
=======================================
  Files         353      353           
  Lines       47323    47323           
=======================================
  Hits        37371    37371           
  Misses       9952     9952
Impacted Files Coverage Δ
ppci/lang/c/context.py 83.51% <ø> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more Δ = absolute <relative> (impact), ø = not affected, ? = missing data Powered by Codecov. Last update 9e8f679...b58169c. Read the comment docs.

darleybarreto commented 3 years ago

The history is messed up again, let me fix it.

darleybarreto commented 3 years ago

It keeps making a different commit for the one I don't have. I am doing:

git fetch upstream
git merge upstream/master
git push origin -f HEAD

How can I fix it?

pfalcon commented 3 years ago

It keeps making a different commit for the one I don't have.

Can you elaborate?

git merge upstream/master

Never use "merge" command, it's damned. (Well, merge --ff-only is sometimes useful).

Always use rebase and pull --rebase.

darleybarreto commented 3 years ago

Always use rebase and pull --rebase

Thanks @pfalcon that did the trick :)

windelbouwman commented 3 years ago

Thanks for this cool example!