Skip to content

London | May 2025 | Victoria Scott | Sprint 2 Coursework #690

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from

Conversation

VictoriaScottCodes
Copy link

Self checklist

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

Changelist

Answers to sprint 2 questions

@VictoriaScottCodes VictoriaScottCodes added the Needs Review Trainee to add when requesting review. PRs without this label will not be reviewed. label Aug 1, 2025
Copy link
Contributor

@cjyuan cjyuan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Code looks good.

  • To keep this branch clean, you should keep only modified files in the Sprint-2 folder in this branch. It seems that the current branch was created from your Sprint-1 branch instead of from main. Can you rebase this branch onto main?

  • You should also practice "committing files one by one, on purpose, and for a reason" in future PR. In VSCode, you can select which file to stage, and commit only the staged file. See: https://www.youtube.com/watch?v=z5jZ9lrSpqk&t=705 (At around 12:50 minute marker, the video shows how to stage a single file).

Comment on lines +15 to +18
function capitalise(str) {
let capitalisedStr = `${str[0].toUpperCase()}${str.slice(1)}`;
return capitalisedStr;
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code is correct but indentation is off.

@cjyuan cjyuan added Reviewed Volunteer to add when completing a review with trainee action still to take. and removed Needs Review Trainee to add when requesting review. PRs without this label will not be reviewed. labels Aug 12, 2025
@cjyuan
Copy link
Contributor

cjyuan commented Aug 12, 2025

Here are the instructions to rebase your branch onto main. (The 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 Sprint-2 and B1 is Sprint-1.

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 (on GitHub):
git push --force origin

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Reviewed Volunteer to add when completing a review with trainee action still to take.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants