Practice-rebase-off-platform project

learningcodetoday · June 1, 2023, 4:05pm

jalcoding8/practice-rebase-off-platform-project/blob/main/The little black fish - part 1

It was the longest night of winter. At the bottom of the sea an old fish gathered together 12,000 of her children and grandchildren and began to tell them this story:

Once upon a time a little black fish lived with her mother in a small pond on the side of a mountain. Their home was behind a black, moss-covered rock, under which they both slept at night. The little fish longed to see the moonlight in their home just once. From morning till evening, the mother and child swam after each other. Sometimes they joined other fish and rapidly darted in and out of small crevices. The little fish was an only child, for of the 10,000 eggs which the mother had laid, only she had survived.

For several days the little fish had been deep in thought and had talked very little. She swam slowly behind her mother around the pond and did not play with the other fish. Her mother thought her child was sick and would soon be well. In fact, the black fish's sickness was really something else!

Early one morning before the sun had risen, the little fish woke her mother and said

"Mother, I want to talk to you."

Half-asleep, the mother responded

"Child, this isn't the time to talk. Save your words for later. Go swimming?"

"No, Mother! I can't go swimming anymore. I must leave here."

"Do you really have to leave?"

"Yes, Mother, I must go."

This file has been truncated. show original

Can someone explain what I am not understanding.
I forked the codecademy project to my Github repository
Then I cloned it locally
When I use git log --graph --decorate --oneline --all I am able to see:

72aa788 (HEAD, origin/main, origin/HEAD, main) More progress made on part 2 by Noah.
ac57fb1 fixed a spacing issue
cc93949 added more content in part 2
f9ccb70 added a conversation in part 2
ec32d24 made more progress in part 2
0777244 added a paragraph in part 2
e626c87 early progress made in both parts

The problem is I cannot do the following:

git checkout part_1_Monday
git pull
git checkout part_2_Monday
git pull
because my branch has the following:

The little black fish - part 1
The little black fish - part 2
instead of part_1_Monday and part_2_Monday

Don’t understand what step I missed>
Thanks

lisalisaj · June 1, 2023, 4:34pm

If I’m understanding correctly…When you forked the repo did you keep the upstreamed name or rename it “part_1_Monday” and “part_2_Monday”? Does the cloned name match the forked name?

See:

learningcodetoday · June 1, 2023, 5:33pm

If you look at the GitHub for the codecademy project you will see that they have 3 branches:
main
part_1_Monday
part_2_Tuesday

But my fork only has 1 branch:
main

Somehow I neglected to follow the protocol to get all 3 branches

learningcodetoday · June 1, 2023, 6:06pm

OK, got it.
I had to add each branch as a separate step in GitHub because I initially just forked the Codecademy project main branch.
That resulted in me having only the main branch., 1 branch, not all 3.
So I had to click on NEW BRANCH twice, once for part_1_Monday and again for part_2_Tuesday.
Then I could do git checkout part_1_Monday, git pull
and the same for the second branch
For anyone having trouble take a moment to look though the GitHub page
Also as I have almost completed the project I see there is a walkthrough video which I will now look at.
I think it is helpful to struggle and troubleshoot and use the Forum before looking at a walkthrough video.