West Midlands | ITP-May - 25| Jonathan Boahene | Sprint-2 | Module-Structuring-and-Testing-Data

[Abayie]

Learners, PR Template

Self checklist

• I have committed my files one by one, on purpose, and for a reason
• I have titled my PR with Region | Cohort | FirstName LastName | Sprint | Assignment Title
• I have tested my changes
• My changes follow the style guide
• My changes meet the requirements of this task

Changelist

Briefly explain your PR.
In this pull request I have added improved solutions and comprehensive tests for Sprint 2 of Module-Structuring-and-Testing-Data.
I refactored functions to handle edge cases and ensure correct formatting, such as converting 24-hour time strings to 12-hour clock format with am/pm.
The code now includes robust test cases for different input scenarios, including midnight, noon, single-digit hours, and times close to midnight and noon.
These changes enhance reliability and maintainability, making the code easier to understand and verify for a wide range of data inputs.

Questions

Ask any questions you have for your reviewer.

[cjyuan]

• Code is solid and explanation is clear. Great job!

• This branch contains some unrelated modified files in the Sprint-1 folder. Can you revert the changes in the Sprint-1 folder?

[Abayie]

Unfortunately this has happened to me again, I sometimes work on different branches at the same time and forget to switch branches.

Would you be able to assist me with any documentation on how to revert these changes from sprint 1 as I have no clue how to do this.

[Abayie]

Trying to delete unrelated files

[cjyuan]

The "Files changed" tab shows the difference between your branch (coursework/sprint-2) and the branch you want to merge your commits (CodeYourFuture's main):

As a result, when we delete files that were originally found in the main branch, the files will be reported as "changed files". In your case, the three files you deleted in "Sprint-1" folder are still appearing as changed files.

Normal way to revert changes is to use git rebase or git reset commands to manipulate the commits made on the branch.

An alternative approach to revert changes made to a file in this branch is to replace the file by the version of the file in main. To fix your branch, you can

1. Download your main branch as a ZIP file from GitHub (https://github.com/Abayie/Module-Structuring-and-Testing-Data/tree/main),
2. In VSCode or using Git, switch to coursework/sprint-2 branch.
3. Replace the files you want to revert by the version of the files in the downloaded ZIP file.
4. Verify the change.
5. Make a commit and push the commit to GitHub.

[Abayie]

The last option which seems pretty much the obvious choice for me to follow, wont replacing the files on the coursework/sprint-2 branch with the "main" files cause me to work on the same changes I made earlier on just the branch to vanish thereby having to redo the work twice?

[cjyuan]

You only need to revert the modified files that are NOT inside the "Sprint-2" folder, as they are not related to Sprint-2 exercise.

[Abayie]

I don't quite understand the instruction then, but I am available for short call on video if you're available to help me figure this out, thank you.

[cjyuan]

Sure. Send a huddle to me on Slack? "CJ Yuan". You can just share your screen.