LONDON | May-2025 | Aida Eslamimoghadam| Module-Structuring-and-Testing-Data | Sprint-2

[aydaeslami]

Self checklist

• I have committed my files one by one, on purpose, and for a reason
• I have titled my PR with REGION | COHORT_NAME | FIRST_NAME LAST_NAME | PROJ_NAME
• I have tested my changes
• My changes follow the style guide
• My changes meet the requirements of this task

Changelist:

• Answered all exercise questions
• Fixed errors & Explained
• Completed stretch questions with thoughtful answers

UPDATE

Fixed issue. Branch is correct now.

[cjyuan]

Can you backup your code in Sprint-2 branch and follow these instructions to fix your branch? Its a good chance to practice using git to rebase a branch.

This instructions assume you had created a branch named B2 from a branch named B1 instead of from main, and you wanted to rebase B2 from B1 onto main.

In your case, B2 is sprint2 and B1 is Sprint1.

Important:

• You need to execute the commands within your cloned repository.
• You may want to backup your files before trying these commands

1. Open Your Cloned Repository in VSCode and Start a Terminal in VSCode.

VSCode will start the terminal in the top-level folder of the current project.

2. Switch to the branch you want to rebase (B2)

git switch B2

Note:

• You can check which branch is the current branch via the command git branch (to list all branches with current branch highlighted)

3. Rebase B2 from B1 onto main

git rebase --onto main B1 B2

For more details about this command, ask an AI tool or see
https://www.atlassian.com/git/tutorials/rewriting-history/git-rebase#:~:text=interactive%20rebase%20display-,Advanced%20rebase%20application,-The%20command%20line

4. Update (and Overwrite) your files in the remote branch B2 (on Github)

While you are in branch B2 and you have verified that it has been successfully rebased, execute the following command to update the remote branch based on the state of the local branch.

git push --force origin

[cjyuan]

Your code is well written.

Please fix the branch. :)

[cjyuan]

Why not declare the variable and start its name with a lowercase letter?

[aydaeslami]

Hi Cj,
Thank you for your review.
I am trying to fix this issu. I learnt CamelCase incorrectly and I know it use for build-in function.
sorry about it.
I also fixed Branch issu.
Many thanks
Aida

[cjyuan]

Well done!