I created a new branch new-development, pulled the changes in create-mobile-cards-tf into this new branch. Had to rebase. Here is a screenshot of my terminal showing the creation of the new branch then pulling the create-mobile-cards-tf, then the instructions to rebase. You can see it dropped two of the commits, but let me rebase the card creation because Ki and I had added code to that section. Once rebased, I manually added the changes that had been dropped.
I then changed our default branch in this repository to new-development instead. But because changes had been made to development, it suggested a pull request to pull development into new-development. I opened this pull request to close it in case anyone else would see the message. But this is a good place to document the changes I made.
I created a new branch
new-development
, pulled the changes increate-mobile-cards-tf
into this new branch. Had to rebase. Here is a screenshot of my terminal showing the creation of the new branch then pulling thecreate-mobile-cards-tf
, then the instructions to rebase. You can see it dropped two of the commits, but let me rebase the card creation because Ki and I had added code to that section. Once rebased, I manually added the changes that had been dropped.I then changed our default branch in this repository to
new-development
instead. But because changes had been made todevelopment
, it suggested a pull request to pulldevelopment
intonew-development
. I opened this pull request to close it in case anyone else would see the message. But this is a good place to document the changes I made.