Skip to content

London | 26-ITP-Sep | Mandip Sanger | Sprint 3 | Dead code - #1764

Open
mandipsanger wants to merge 24 commits into
CodeYourFuture:mainfrom
mandipsanger:sprint-3/dead-code
Open

mandipsanger wants to merge 24 commits into
CodeYourFuture:mainfrom
mandipsanger:sprint-3/dead-code

Conversation

@mandipsanger

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-1066

Changelist

Deadcode

@github-actions

This comment has been minimized.

@dkrest1 dkrest1 added the Review in progress This review is currently being reviewed. This label will be replaced by "Reviewed" soon. label Nov 4, 2026
@github-actions

This comment has been minimized.

@dkrest1

dkrest1 commented Nov 4, 2026

Copy link
Copy Markdown

Hi Mandip! 👋

Thanks for your work on this assignment.

I noticed that GitHub is reporting a merge conflict on this PR. Could you please resolve the conflict with the main branch?

Also, the automated check previously flagged Sprint-3/2-practice-tdd/count.js as an unexpected file for this assignment. Could you double-check the Files changed tab and make sure the PR only contains changes relevant to the Dead Code exercise?

Once these are resolved, we can continue with the code review.

Thanks, and keep up the good work!

@dkrest1 dkrest1 added the Reviewed Volunteer to add when completing a review with trainee action still to take. label Nov 4, 2026
@github-actions

This comment has been minimized.

@mandipsanger

Copy link
Copy Markdown
Author

Thank you for checking. I have tried to replace this original file for over 3 weeks now. Also removed the auto formatting as you can see from the committs have replaced the original file many time but still it is not going through and not making changes. I tried to do with oleg in the workshop too but didnt get sucess. Is there any way you could help with this? It doesn't let me reslove conflicts and merge changes. Does it mean I have to make a new branch and new PR?

@dkrest1

dkrest1 commented Nov 17, 2026

Copy link
Copy Markdown

Hi @mandipsanger,

Apologies for the delayed response.

I appreciate the effort you've put into trying to resolve this over the past few weeks.

I've checked your PR again, and the count.js file still contains a change to its export syntax. There is also an outstanding merge conflict.

You don't necessarily need to create a new branch or PR yet. I'm happy to help you troubleshoot this.

Could you please run the following commands in your terminal and share the output?

git status
git branch --show-current
git remote -v

This will help us understand the current state of your repository and determine the safest way to resolve the issue without losing your completed exercises.

If necessary, we can create a clean branch from the latest main branch and transfer only your Dead Code changes.

Thanks for your persistence, and well done for reaching out for help!

@mandipsanger

Copy link
Copy Markdown
Author
Screenshot from 2026-11-21 14-35-22

Thank you for solution. Its showing there is no file everything is upto date however Pr was made back in May cohort.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

NotCoursework Review in progress This review is currently being reviewed. This label will be replaced by "Reviewed" soon. 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