LONDON | MAY_25 | EMILIANO URUENA | SPRINT2

[Emilianouz]

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

Sprint 2 - Module Structuring and Testing Data
COMMITS:

1. Block errors MSTD_Sprint2 predictions and interpretations.
2. Mandatory debug MSTD_Sprint2 debug explained and solved.
3. Mandatory implement MSTD_Sprint2 solved.
4. Mandatory Interpret MSTD_Sprint2 answered.
5. format-time MSTD_Sprint2 function to convert 24 hour clock times to 12 hour clock times, solved and tested.

[cjyuan]

Branch is not clean; it contains modified files in "Sprint-1" folder. Can you fix the branch?

It seems you have created the current branch from coursework/sprint-1 instead of from main.

One way to fix this branch is to rebase the current branch onto main. Here are the steps (using git on command line interface) to do it:

---

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 to main.

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:
git push --force origin

[cjyuan]

Changes look good. Well done!