Rama mathias

[Jake2420]

Cambios por el grupo1

[wjt]

The Revert "Update" commit means that we can't merge this: Git wants to apply that same change to the upstream repository.

@Jake2420 @JuaniCargnel I suggest you do the following:

• Disable branch protection on your fork
• Reset main in your fork to match endlessm:main
• Rebase the Agregando storyquest del grupo 1 commit onto main

[JuaniCargnel]

Hi @wjt! Sorry about that — this was a mistake from the students, they never canceled the PR! They just forgot to change it so that the PR would go to the org main branch.

Regarding the “Revert Update,” that was me — I did it when we had to update the ORGs. I had made a PR to update them, but then the option to disable protection came up, so I did the revert to make all the ORGs consistent... it didn’t work i guess, haha. Could that cause problems in the future? Everything should be fine now, but I might have messed something up — sorry about that.

[wjt]

@JuaniCargnel main...Game-Lab-5-0-UTP-Grupo-2-Equipo-1:threadbare:main shows that you have a revert on the main branch - it will cause problems. I think you should reset this branch to match our current main. (Disable branch protection, sync branch.)

[JuaniCargnel]

Okay @wjt, all set. I updated the rama_mathias branch and then made a PR to the Org’s main branch so both are up to date... I hope I did everything right haha. If you can, I’d really appreciate it if you could confirm!

Also, I just want to clarify again that this PR we’re talking in should be rejected (or closed) since it was just a mistake.

Thanks a lot for your help!

[wjt]

Okay @wjt, all set. I updated the rama_mathias branch and then made a PR to the Org’s main branch so both are up to date... I hope I did everything right haha. If you can, I’d really appreciate it if you could confirm!

main...Game-Lab-5-0-UTP-Grupo-2-Equipo-1:threadbare:main is still incorrect. You need to reset main in the fork to match main in this repo.

The problematic commit is Game-Lab-5-0-UTP-Grupo-2-Equipo-1@fa6fe66

If you disable branch protection in the fork, you should be able to use the destructive "Discard X commits" option in the "Sync fork" menu:

Edit: just to clarify you should not use this option if there are any intentional changes by learners on the fork's main branch. It will discard any such changes.

After resetting main you'll need to rebase the 1 patch in the rama_mathias branch onto the new main

[wjt]

Also, I just want to clarify again that this PR we’re talking in should be rejected (or closed) since it was just a mistake.

OK!