Move garatronic_pybstick26_rp2040.h to develop branch

[garatronic]

pybstick26_rp2040.h become garatronic_pybstick26_rp2040.h

[kilograham]

this is still an add of the new file without a remove of the old file

[garatronic]

hope this will do the job...

[lurch]

Still only showing "Files changed: 1" up at the top... 😕

[garatronic]

I pray on my knees

[lurch]

Ahhhh, you've based this PR on top of a 25th October version of pico-sdk (see https://github.com/garatronic/pico-sdk/commits/develop ), which was from before #636 (which added pybstick26_rp2040.h) was merged; and I think that's why the "Files changed" tab on this PR is only showing garatronic_pybstick26_rp2040.h as being added and isn't showing pybstick26_rp2040.h as being removed.

I think you need to rebase your garatronic:develop branch up to a more recent version of raspberrypi:develop ? I dunno the best way of doing that but perhaps @kilograham can advise?

[kilograham]

e.g.

git fetch
git rebase origin/develop

[garatronic]

I've got another recipe : delete my github pico-sdk fork it again clone it on my local computer - git checkout develop - git add garatronic_pybstick26_rp2040.h - git checkout master - git remove pybstick26_rp2040.h - git commit -S -m "basta !" and PR again on github. What do you thing about ? De: "Graham Sanderson" ***@***.***> À: "raspberrypi" ***@***.***> Cc: "Frédéric Pierson" ***@***.***>, "Author" ***@***.***> Envoyé: Vendredi 3 Décembre 2021 02:36:09 Objet: Re: [raspberrypi/pico-sdk] Move garatronic_pybstick26_rp2040.h to develop branch (PR #671) e.g. git fetch git rebase origin/develop — You are receiving this because you authored the thread. Reply to this email directly, [ #671 (comment) | view it on GitHub ] , or [ https://github.com/notifications/unsubscribe-auth/AHNK7YRUYBZ57VNGXNNOISLUPANITANCNFSM5JHGVU6Q | unsubscribe ] . Triage notifications on the go with GitHub Mobile for [ https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675 | iOS ] or [ https://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign%3Dnotification-email%26utm_medium%3Demail%26utm_source%3Dgithub | Android ] .

[lurch]

That looks vaguely right, but I think you want to do everything on develop and ignore the master branch ?

[garatronic]

Since the beginning, 'pybstick26_rp2040.h' is in the master branch (you accept the PR even if it was on master) and tagged v1.3.0. By now, i just want to modify and rename it this file. So creating a new on in develop branch and removing useless one in the master branch is ok or not ? De: "Andrew Scheller" ***@***.***> À: "raspberrypi" ***@***.***> Cc: "Frédéric Pierson" ***@***.***>, "Author" ***@***.***> Envoyé: Vendredi 3 Décembre 2021 11:54:21 Objet: Re: [raspberrypi/pico-sdk] Move garatronic_pybstick26_rp2040.h to develop branch (PR #671) That looks vaguely right, but I think you want to do everything on develop and ignore the master branch ? — You are receiving this because you authored the thread. Reply to this email directly, [ #671 (comment) | view it on GitHub ] , or [ https://github.com/notifications/unsubscribe-auth/AHNK7YTQLNK3NOTOGMFAIILUPCOV3ANCNFSM5JHGVU6Q | unsubscribe ] . Triage notifications on the go with GitHub Mobile for [ https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675 | iOS ] or [ https://play.google.com/store/apps/details?id=com.github.android&referrer=utm_campaign%3Dnotification-email%26utm_medium%3Demail%26utm_source%3Dgithub | Android ] .

[lurch]

If you delete it on develop, then that "deletion" will also happen when we next merge the develop branch into the master branch.

[kilograham]

yeah, don't checkout master

[garatronic]

So, supposing you validate the PR at it is now, it will add, on next tagged version V1.3.1, 'garatronic_pybstick26_rp2040.h' into master branch side by side with the other 'pybstick26_rp2040.h', no ?

[lurch]

Correct. But if you update this PR as instructed to delete 'pybstick26_rp2040.h' from the develop branch, then when we merge develop into master (and tag v1.3.1) then git will also delete the 'pybstick26_rp2040.h' file from the master branch too. Git is clever like that 😉

[garatronic]

"Le mieux est parfois l'ennemi du bien"
I give up. Do what you want.

[lurch]

@garatronic see #675