Skip to content

Conversation

@fkuhne
Copy link
Contributor

@fkuhne fkuhne commented Feb 28, 2021

Adjust code according to comments on previous PR.

@lurch
Copy link
Contributor

lurch commented Feb 28, 2021

Looks like you need to rebase and force-push.

@fkuhne
Copy link
Contributor Author

fkuhne commented Feb 28, 2021

Rebase done.

@lurch
Copy link
Contributor

lurch commented Feb 28, 2021

The "Commits" tab still shows 11 commits, which doesn't look right? 😕

This PR LGTM otherwise 👍

@fkuhne
Copy link
Contributor Author

fkuhne commented Mar 1, 2021

Oh, I see. Well, I tried to do this PR by myself but clearly I'm stumbling. Truth is that although being a git user for years, I've never done a PR before :).

@lurch, can you point me out the best way to do it? Should I close this one and start from the beginning?

Thanks!

@lurch
Copy link
Contributor

lurch commented Mar 1, 2021

It should just be something like:

git fetch origin
git rebase origin/develop
git push -f fork onboard_temperature

See https://docs.github.com/en/github/using-git/using-advanced-git-commands for more help. Or if you get in a complete mess you could just close this PR and create a fresh one 😆

@fkuhne
Copy link
Contributor Author

fkuhne commented Mar 1, 2021

Sounds better now, with the exception of usb/device/dev_hid_generic_inout/dev_hid_generic_inout.c which appeared here with some typo fixes (wasn't me).

@lurch
Copy link
Contributor

lurch commented Mar 1, 2021

Looks like #30 got merged straight into the master branch but somehow never made it onto the develop branch 😕 (which is probably why it's "hanging around" on your branch now that you've rebased your PR from master to develop)

So you can either:

  • get fancy with interactive-rebase to remove that commit from your branch
  • kill your current branch and create a new one
  • wait for Cherry-pick #30 onto develop branch #77 to get merged, hopefully after which rebasing onto develop will work correctly

Sorry for the confusion! 🙁

@fkuhne
Copy link
Contributor Author

fkuhne commented Mar 1, 2021

OK, I think that's it.

I'm thinking in, maybe, contribute with this repo with some more examples. I would go for Tensorflow Lite Micro integration but it will take time. There is something you guys see that I can do to help?

@lurch
Copy link
Contributor

lurch commented Mar 2, 2021

OK, I think that's it.

Almost... the "Commits" tab now lists 6 commits, with the last commit being the "inverse" of the first commit. Would you mind squashing them down to a single commit please? (I think that would make the "bad commits" disappear)
Again, sorry this has been so awkward for you!

I would go for Tensorflow Lite Micro integration but it will take time.

That's already been done at https://github.com/raspberrypi/pico-tflmicro 🙂

There is something you guys see that I can do to help?

We're a bit busy at the moment getting the next SDK-version out of the door, but once that's done I'll ask the team if they have any ideas. Thanks for the offer of help 👍

@fkuhne
Copy link
Contributor Author

fkuhne commented Mar 2, 2021

OK, I think that's it.

Almost... the "Commits" tab now lists 6 commits, with the last commit being the "inverse" of the first commit. Would you mind squashing them down to a single commit please? (I think that would make the "bad commits" disappear)
Again, sorry this has been so awkward for you!

I have to say sorry to bother all this time for such a silly thing... It should not be that harsh, haha. But that's OK, it was an opportunity to learn.

Maybe it's better to start a fresh new PR. If I squash the commits the username will be from the guy who fixed #30. It's not because I want my name, but I think it may cause confusion later... What do you think? Either way I'm OK with your decision.

I would go for Tensorflow Lite Micro integration but it will take time.

That's already been done at https://github.com/raspberrypi/pico-tflmicro 🙂

That's awesome! I'l go there right away get my hands dirty. :D

There is something you guys see that I can do to help?

We're a bit busy at the moment getting the next SDK-version out of the door, but once that's done I'll ask the team if they have any ideas. Thanks for the offer of help 👍

My pleasure! ;)

@lurch
Copy link
Contributor

lurch commented Mar 2, 2021

But that's OK, it was an opportunity to learn.

Yup, always good to be learning 👍

If I squash the commits the username will be from the guy who fixed #30

True, I hadn't considered that!

Maybe it's better to start a fresh new PR.

Yeah, that might be the easiest option in the end!!

@lurch
Copy link
Contributor

lurch commented Mar 3, 2021

@fkuhne #77 has now been merged, so with a bit of luck, and if the wind is blowing in the right direction, one more round of:

git fetch origin
git rebase origin/develop
git push -f fork onboard_temperature

should get things back in order? 🤞

@fkuhne fkuhne closed this Mar 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants