search

uli / basicengine-firmware

BASIC Engine Firmware
78 stars 16 forks source link

vreg $36 #44

Closed konimaru closed 4 years ago

konimaru commented 4 years ago

Fixes #42.

uli commented 4 years ago

The second and third commits are effectively fixups for the first; please squash them into it.

konimaru commented 4 years ago

Ah, the dreaded rebase :) Just in case you're more experienced with this., I always manage to get the squashing bit right. Then however it asks me to merge my remote branch (as they have diverged). So I effectively end up with the squashed commit and a merge commit. Is that expected behaviour?

konimaru commented 4 years ago

OK, I figured it out. But it seems that my branch is now beyond help. I create a new pull request.