chingu-voyages / v48-tier1-team-05

A dinosaur app for viewing detailed information about your favorite dinosaurs | Chingu Voyage-48 | https://chingu.io/
https://chingu-voyages.github.io/v48-tier1-team-05/
4 stars 0 forks source link

Pushing missing mobile card code to main branch #173

Closed terrifricker closed 5 months ago

terrifricker commented 5 months ago

To fix problem.

Problem: The repository development branch did not contain the mobile card creation code. Here is a screenshot of the code seen on GitHub. Screen Shot 2024-04-13 at 7 47 13 AM

It is also not in my local development branch. Screen Shot 2024-04-13 at 7 49 43 AM

The code does exist in branch create-mobile-cards-tf, both in the repository and my local branch Screen Shot 2024-04-13 at 7 52 00 AM

But when I try to make a pull request comparing the create-mobile-cards-tf to development, GitHub says that there isn't anything to compare. Screen Shot 2024-04-13 at 7 54 33 AM

I think the problem is because I originally mistakenly committed my changes to create the mobile cards directly to the development branch. (I typed git switch to make a new branch instead of git checkout -b and a new branch was not created, but I didn't see the message in the terminal.) I also probably made it worse by trying to reset the development branch back to the state before I made those commits. We reverted a pull request with the mobile cards code, removing it out of the development branch, but I think the development branch still thinks it received it because of my origin direct commits. (That is my best guess.)

Anyway, I am trying to fix it by pushing those changes directly to the main branch, bypassing the development branch. The main branch was updated to pull request #156. Branch create-mobile-cards-tf includes pull requests up to #169. All of those changes will be included in this pull request.

Once the mobile card code is in the main branch, I will push the main branch into the development branch, and see what happens. Wish me luck!

terrifricker commented 5 months ago

Merging myself, bypassing branch protections.