Problem: The repository development branch did not contain the mobile card creation code. Here is a screenshot of the code seen on GitHub.
It is also not in my local development branch.
The code does exist in branch create-mobile-cards-tf, both in the repository and my local branch
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.
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!
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.
It is also not in my local development branch.
The code does exist in branch
create-mobile-cards-tf
, both in the repository and my local branchBut when I try to make a pull request comparing the
create-mobile-cards-tf
todevelopment
, GitHub says that there isn't anything to compare.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 ofgit 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!