Issue with last tuesday’s practice pull request

[margapayerass]

Hello, when submitting the final push for Tuesday’s practice, we encountered an error. Since we only followed the provided steps and neither Lorea nor I are able to pass the tests, I think the issue might not be on our side. Could you please take a look?

https://github.com/Biomedical-Electronics/masb-course-adcs-barrenderas/actions/runs/23195957313/job/67425358269?pr=17

[maarcjimeneezz]

Roc and I have the same problem :(

[TheAlbertDev]

Yes, you're right. It's a bug on my end, not yours. Sorry for the inconvenience!

Could you please open an issue in the repository so I can track it? I'll have it fixed by noon and will share the commands you'll need to pull the fix into your repos.

Thanks for flagging it!

[margapayerass]

Done!

[TheAlbertDev]

Hey! I've pushed the patch. To incorporate it into your repos, run the following commands (replace <username> with your GitHub username):

git switch main
git pull
git remote add upstream-2 https://github.com/TheAlbertDev/masb-course-adcs.git
git fetch upstream-2
git cherry-pick 04ee519
git push
git switch stm32cube/<username>/analog-dma
git rebase main
git push --force

Here's what each command does:

1. Get your main branch up to date

git switch main
git pull

Switch to your main branch and pull the latest changes from your remote.

2. Add the course repo as a second remote and fetch it

git remote add upstream-2 https://github.com/TheAlbertDev/masb-course-adcs.git
git fetch upstream-2

This registers the course repo as a new remote called upstream-2 and downloads its history locally — without modifying your branches.

3. Cherry-pick the patch commit

git cherry-pick 04ee519

This takes the specific commit with the fix (04ee519) from the course repo and applies it on top of your main branch.

4. Push main

git push

Push your updated main (now including the patch) to your remote.

5. Rebase your working branch on top of the updated main

git switch stm32cube/<username>/analog-dma
git rebase main
git push --force

Switch to your working branch, rebase it on top of the updated main so it includes the patch, and force-push to update the remote.

Let me know if you run into any issues! 💪