Skip to content

London | 26-ITP-Sep | Sakiya Mayow | Sprint 2 | JavaScript-Fundamentals - #1567

Closed
zakiaao-tech wants to merge 28 commits into
CodeYourFuture:mainfrom
zakiaao-tech:Editing
Closed

zakiaao-tech wants to merge 28 commits into
CodeYourFuture:mainfrom
zakiaao-tech:Editing

Conversation

@zakiaao-tech

Copy link
Copy Markdown

Learners, PR Template

Self checklist

  • I have titled my PR with Region | Cohort | FirstName LastName | Sprint | Assignment Title
  • My changes meet the requirements of the task
  • I have tested my changes
  • My changes follow the style guide

Task code

CYF-1039.

Changelist

I completed the 4 exercises for my coursework, and provided explanation where needed. These exercises included slice() methods, functions, index, number, variables, mathematical calculations, correcting errors, dividing, and objects.

@netlify

netlify Bot commented Sep 21, 2026

Copy link
Copy Markdown

Deploy Preview for cyf-onboarding-module ready!

Name Link
🔨 Latest commit 6f8812e
🔍 Latest deploy log https://app.netlify.com/projects/cyf-onboarding-module/deploys/6ab1aecda071430008005ced
😎 Deploy Preview https://deploy-preview-1567--cyf-onboarding-module.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.
Lighthouse
Lighthouse
2 paths audited
Performance: 100 (no change from production)
Accessibility: 100 (no change from production)
Best Practices: 100 (no change from production)
SEO: 86 (no change from production)
PWA: -
View the detailed breakdown and full score reports
🤖 Make changes Run an agent on this branch

To edit notification comments on pull requests, go to your Netlify project configuration.

@zakiaao-tech zakiaao-tech added the Needs Review Trainee to add when requesting review. PRs without this label will not be reviewed. label Sep 21, 2026
@github-actions

This comment has been minimized.

@github-actions github-actions Bot removed the Needs Review Trainee to add when requesting review. PRs without this label will not be reviewed. label Sep 21, 2026
@github-actions

This comment has been minimized.

@zakiaao-tech zakiaao-tech added the Needs Review Trainee to add when requesting review. PRs without this label will not be reviewed. label Sep 21, 2026
@github-actions

This comment has been minimized.

@github-actions github-actions Bot removed the Needs Review Trainee to add when requesting review. PRs without this label will not be reviewed. label Sep 21, 2026
@zakiaao-tech zakiaao-tech added the Needs Review Trainee to add when requesting review. PRs without this label will not be reviewed. label Sep 21, 2026

@abdishakoor-dev abdishakoor-dev left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

One thing to fix before I look at the exercises.

What happened

Your Form Controls PR (#1500) was opened from your main branch. So your Form Controls commits are on your main. We should have asked you to fix this on that PR. Then you would have made a new branch before you started Sprint 2.

Then you made this branch from your main. A new branch copies every commit from the branch it starts from. So this branch has 12 Form Controls commits too. You can see them in the Commits tab of this PR.

That is why the bot kept rejecting this PR. You restored the Form Controls files, and that fixed the files. But the 12 commits are still here.

The rule

Every task gets its own new branch. The new branch starts from CodeYourFuture's main. Never do coursework on main itself.

How to fix this PR

Open the terminal in VS Code, in your Module-JavaScript-Fundamentals folder. Run these lines one at a time:

git remote add upstream https://github.com/CodeYourFuture/Module-JavaScript-Fundamentals.git
git fetch upstream
git switch --no-track -c sprint-2 upstream/main
git cherry-pick f95b8bd..cab49f2
git push --set-upstream origin sprint-2

What each line does:

  1. Gives CodeYourFuture's repo the name upstream on your computer. If git says "remote upstream already exists", that is fine. Go to the next line.
  2. Downloads the latest version of CodeYourFuture's main.
  3. Makes a new branch called sprint-2. It starts from CodeYourFuture's main, not from yours.
  4. Copies your 14 Sprint 2 commits onto the new branch. The Form Controls commits are not copied.
  5. Sends the new branch to your fork on GitHub.

I tested these lines on a copy of your fork. All 14 commits copy with no errors. The files are the same as in this PR now, so you will not lose any work.

Before you open the new PR, check it:

git log --oneline upstream/main..HEAD

You should see 14 commits. All of them should be Sprint 2 work.

Then open a new PR from the sprint-2 branch. Link to this PR in the description, and close this one. I will review the exercises there.

For your next task

You only need git remote add once. For Sprint 3, start like this:

git fetch upstream
git switch --no-track -c sprint-3 upstream/main

Leave your main as it is for now. Your Form Controls PR uses it. Just do not start new work on it.

@abdishakoor-dev abdishakoor-dev 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 Sep 22, 2026
@zakiaao-tech

Copy link
Copy Markdown
Author

i done most of the instructions, i will open a new PR now. Thank you for your help

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